cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,172 Commits 1 Branch 0 Tags
d99115c26315d0d1df2ef638f60d5caca5269096
Commit Graph
609 Commits
Author SHA1 Message Date
Dominik Schürmann d99115c263 preselect certify key 2014-10-05 01:23:34 +02:00
Dominik Schürmann 1dbb3db320 Display result in multi certify 2014-10-04 23:47:17 +02:00
Vincent Breitmoser 4b372a5c33 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:31:04 +02:00
Dominik Schürmann 4fcd58b9f8 use new multi certify, layout fixes 2014-10-04 23:32:25 +02:00
Vincent Breitmoser f96f289891 merge key ids in getSelectedCertifyActions 2014-10-04 23:30:42 +02:00
Vincent Breitmoser 015291eb61 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:18:07 +02:00
Vincent Breitmoser bad8aeea78 implement preliminary MultiCertifyActivity (most heavy lifting is done) 2014-10-04 23:16:51 +02:00
Dominik Schürmann fbf993e621 add divider 2014-10-04 23:16:17 +02:00
Dominik Schürmann e75e3d371d qr code download, cleanup 2014-10-04 21:40:28 +02:00
Dominik Schürmann 0599f0dd4e Workings on new parcel for key downloads 2014-10-04 21:09:32 +02:00
Dominik Schürmann 9e1a0c2c0a Pass imported master key ids via result parcel 2014-10-04 18:59:59 +02:00
Vincent Breitmoser 0ffa1b94de certify: get rid of fingerprint check 
Master key ids are unambiguous by database design, and only keys which
are in the database are signed. There is no reason to check the
fingerprint again during the certify operation.
 2014-10-04 18:30:14 +02:00
Dominik Schürmann c614d8d4e0 Fixing import, start qr code stuff 2014-10-04 18:22:55 +02:00
Dominik Schürmann 7891560fc2 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 15:42:36 +02:00
Dominik Schürmann a29d6b0ef3 Import code, fix collision of key spinner with other loaders 2014-10-04 15:42:23 +02:00
Vincent Breitmoser 0e0e3d8dd0 redesign certify action to work with parcel input and result 2014-10-04 15:19:43 +02:00
Dominik Schürmann f0ee7ed4cf New add keys activity 2014-10-04 13:44:34 +02:00
Vincent Breitmoser f03822fefd fix nullpointer on button push while data is still loading 
fixes #934
 2014-10-03 23:08:32 +02:00
Dominik Schürmann d5c6e430a5 Null check for getSelectedEntries 2014-10-03 13:37:49 +02:00
Vincent Breitmoser f456c8a17d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-10-03 04:25:08 +02:00
Vincent Breitmoser 00bbf8c267 move IteratorWithSize interface into ParcelableFileCache - much cleaner 2014-10-03 04:22:32 +02:00
Vincent Breitmoser 504064302b actually use iterator interface for ParcelableFileCache in activities 2014-10-03 04:16:14 +02:00
Vincent Breitmoser a91468565f use iterator interface exclusively in ParcelableFileCache 2014-10-03 03:29:23 +02:00
Dominik Schürmann 4cfc7feb43 More beautifyKeyIdWithPrefix 2014-10-03 03:16:34 +02:00
Dominik Schürmann ef7eab2c8b Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
 2014-10-03 02:20:38 +02:00
Dominik Schürmann b9dc21969f Fix nullpointer with clipboard 2014-10-03 02:17:51 +02:00
Vincent Breitmoser 4b4e885e55 more getActivity() checks 2014-10-03 02:13:22 +02:00
Vincent Breitmoser 34e4dabea9 fix nullpointer with subtle attention seeker 2014-10-03 02:07:09 +02:00
Vincent Breitmoser 08bfc2ae73 fix hideKeyboard() in other activities as well, just to be safe 2014-10-02 19:40:43 +02:00
Vincent Breitmoser a361e82a4d fix NullPointerException in keyboard hack 2014-10-02 19:35:03 +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 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
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
Dominik Schürmann 9e7c9a0d32 Fix nullpointer in DecryptActivity 2014-09-29 23:05:17 +02:00
Dominik Schürmann 43140c10b1 Fixes for share to decrypt 2014-09-29 22:52:03 +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
Dominik Schürmann 654d98ac2a Fix NfcActivity task stack problem 2014-09-29 21:20:01 +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