moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity
3,121 Commits 12 Branches 24 Tags 116 MiB
Commit Graph

3121 Commits

Author SHA1 Message Date
Dominik Schürmann 9a296c012d Version 3.0 2014-10-02 14:22:06 +02:00
Dominik Schürmann 8192bf99a6 mProgressDialogFragment null check 2014-10-02 14:05:54 +02:00
Dominik Schürmann c2f85c7446 Remove unnecessary call to mFingerprintQrCode 2014-10-02 12:50:38 +02:00
Dominik Schürmann 6da367e469 Fix IllegalStateException in ViewKeyShareFragment 2014-10-02 12:43:18 +02:00
Dominik Schürmann a125b51b1c Fix nullpointer with getS2K() 2014-10-02 12:33:56 +02:00
Dominik Schürmann 675d2bd6dd code style 2014-10-02 11:47:42 +02:00
Dominik Schürmann 8f616bcf0c Add null check when retrieving key ids from contacts api 2014-10-02 11:32:10 +02:00
Dominik Schürmann 17e45d94a8 Add workaround for bug #912 2014-10-02 11:23:43 +02:00
Dominik Schürmann 42ce3bb0d3 Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen 2014-10-01 15:03:53 +02:00
Dominik Schürmann e7cbf975ac More debugging output 2014-10-01 14:14:50 +02:00
Dominik Schürmann f841203f5f Add filterTouchesWhenObscured to prevent Touch-Event Hijacking 2014-10-01 10:51:02 +02:00
Dominik Schürmann 84fcbba74d check key ids when used from api 2014-10-01 10:48:28 +02:00
Dominik Schürmann e1a81ae5cd Update from transifex 2014-09-30 20:00:14 +02:00
Dominik Schürmann cce2365173 Clarify api_create_account_text 2014-09-30 19:55:30 +02:00
Dominik Schürmann b1b16b9313 3.0 beta3 2014-09-30 17:50:16 +02:00
Vincent Breitmoser 51ecce510f fix minor logic error (haha) 2014-09-30 14:10:54 +02:00
Vincent Breitmoser 354bc87579 fix ByteBuffer offset mistake in NfcActivity 2014-09-30 11:36:51 +02:00
Vincent Breitmoser b2b19d7b2b pass (encryption) key id from Decrypt*Fragment to NfcActivity 2014-09-30 02:14:28 +02:00
Vincent Breitmoser 11d0f4510b pass key id for check from EncryptActivity to NfcActivity 2014-09-30 02:03:17 +02:00
Vincent Breitmoser bd3f6a22cb add (optional) keyId check in NfcActivity 2014-09-30 01:47:04 +02:00
Vincent Breitmoser dabdda36cf revamp fingerprint and keyid methods in NfcActivity 2014-09-30 01:46:16 +02:00
Vincent Breitmoser de5dd482e1 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-30 00:51:58 +02:00
Vincent Breitmoser 384724f9b5 request passphrase for correct subkey in OpenPgpService 
fixes #811, hopefully
 2014-09-30 00:51:25 +02:00
Dominik Schürmann 0d7ccd2131 Remove description, now in wiki 2014-09-29 23:28:29 +02:00
Dominik Schürmann 9e7c9a0d32 Fix nullpointer in DecryptActivity 2014-09-29 23:05:17 +02:00
Dominik Schürmann 7531106565 3.0 beta2 2014-09-29 22:54:36 +02:00
Dominik Schürmann f275daf1fb Disable NfcIntentActivity until we implement it properly 2014-09-29 22:54:17 +02:00
Dominik Schürmann 43140c10b1 Fixes for share to decrypt 2014-09-29 22:52:03 +02:00
Dominik Schürmann 8e5c5c9503 Remove unused layouts 2014-09-29 22:24:55 +02:00
Dominik Schürmann 51ea71d68a Maybe fixes encrypt files on tablets 2014-09-29 22:23:48 +02:00
Vincent Breitmoser 0b16a4edfd Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/AndroidManifest.xml
 2014-09-29 21:32:21 +02:00
Vincent Breitmoser 7f547afe42 add barely functional nfc intent activity (WIP!) 2014-09-29 21:31:19 +02:00
Vincent Breitmoser 801fe4d816 add test class for Iso7816TLV class 2014-09-29 21:28:26 +02:00
Vincent Breitmoser c13a7b7eae add class for proper nfc tlv packet parsing 2014-09-29 21:22:48 +02:00
Dominik Schürmann f7fe236bd5 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-29 21:20:30 +02:00
Dominik Schürmann 654d98ac2a Fix NfcActivity task stack problem 2014-09-29 21:20:01 +02:00
Vincent Breitmoser c34a159cae fix method visibility for tests 2014-09-28 15:17:09 +02:00
Vincent Breitmoser 8131daa638 move can.*() methods to CanonicalizedPublicKey, where they belong 2014-09-28 14:50:52 +02:00
Vincent Breitmoser 706e60474d be more mindful of algorithm and usage flag interaction 
Fixes #895
 2014-09-28 14:25:54 +02:00
Vincent Breitmoser c0abae5cc3 only check for primary binding certificate if key algorithm even supports signing 2014-09-28 03:53:14 +02:00
Vincent Breitmoser 4782d22e26 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-28 03:38:14 +02:00
Vincent Breitmoser 1c3d0a58ea Reject subkeys with no key flags and no primary key binding certificate 
Closes #899
 2014-09-28 03:34:25 +02:00
Dominik Schürmann d20f657151 Hide keyboard after cloud search 2014-09-27 14:36:14 +02:00
Dominik Schürmann f22bbbd96c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-27 13:52:05 +02:00
Dominik Schürmann 1a7edc9925 Dont show keyboard by default in key creation to allow the user to get an overview what to type, use spannable where possible 2014-09-27 13:52:01 +02:00
Vincent Breitmoser 1a2ec1eb32 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-26 00:43:08 +02:00
Vincent Breitmoser 4ccb26d2e5 nfc: use proper hex encoding for pin length 
Fixes #886
 2014-09-26 00:39:48 +02:00
Dominik Schürmann 4f0ac61b0e Merge pull request #889 from timbray/master 
Fix bug where Keybase extraData gets lost when SKS wins the search race.
 2014-09-25 11:33:57 +02:00
Tim Bray 6d70e1bfd1 Fix bug where Keybase extraData gets lost when SKS wins the search race. 2014-09-25 02:30:52 -07:00
Dominik Schürmann 999094934a Fixes for new app list 2014-09-24 21:30:03 +02:00