Commit Graph

694 Commits

Author SHA1 Message Date
Vincent Breitmoser 21ea040910 add keys button goes to directly to qr scan 2014-10-10 19:05:33 +02:00
Vincent Breitmoser 2dcd070014 keylist: add safeslinger exchange button to secret keys 2014-10-10 19:05:30 +02:00
Vincent Breitmoser 73ccff9537 Merge remote-tracking branch 'origin/development' into development 2014-10-09 16:26:38 +02:00
Vincent Breitmoser 9d01490d4e reduce memory footprint in QrCodeActivity as well 2014-10-09 16:25:38 +02:00
Vincent Breitmoser a54a0c34fe reduce memory footprint of qr code in share tab 2014-10-09 15:57:44 +02:00
Dominik Schürmann 45b02008fb Replace many PgpGeneralExceptions with PgpKeyNotFoundException 2014-10-09 01:37:44 +02:00
Dominik Schürmann b3f56c927b Revert "Replace PgpGeneralException with NotFoundException where appropriate"
This reverts commit 49b4ff6312.
2014-10-09 00:59:45 +02:00
Dominik Schürmann a13bcbbb5b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-09 00:58:33 +02:00
Dominik Schürmann 49b4ff6312 Replace PgpGeneralException with NotFoundException where appropriate 2014-10-09 00:58:07 +02:00
Vincent Breitmoser f6d0347c79 rename certify_key_item to the more appropriate multi_certify_item 2014-10-08 22:47:30 +02:00
Dominik Schürmann 0d6d4653b4 Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys 2014-10-08 18:31:31 +02:00
Dominik Schürmann 2eb776594f Handle revoked and expired keys in decrypt activity 2014-10-08 17:39:53 +02:00
Dominik Schürmann 158f22a799 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-08 17:32:41 +02:00
Dominik Schürmann b573afe235 New decryption screen UI with modernPGP icons 2014-10-08 17:32:32 +02:00
Vincent Breitmoser 590650a303 remove ui hack, use padding instead of margin 2014-10-08 15:36:18 +02:00
Vincent Breitmoser a96813198c use "Key ID" for beautify 2014-10-08 15:15:10 +02:00
Dominik Schürmann adcc07ca65 Filter key list by certified keys 2014-10-08 14:42:56 +02:00
Dominik Schürmann f4c8c47ac2 Cleanup and fix decrypt activity 2014-10-07 17:35:12 +02:00
Dominik Schürmann 280899410f Certify design 2014-10-07 17:21:46 +02:00
Vincent Breitmoser 84a9085190 get rid of some old code in LogDisplayFragment 2014-10-06 18:58:04 +02:00
Vincent Breitmoser 096f6e436d certify: checkbox fake click area tidbit 2014-10-06 18:50:58 +02:00
Dominik Schürmann 4b6016fcfc Fix app name 2014-10-05 11:19:19 +02:00
Vincent Breitmoser 12e44e7eeb Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-05 11:11:20 +02:00
Vincent Breitmoser 6699917279 add support for second line in log view 2014-10-05 11:10:40 +02:00
Dominik Schürmann 2768671206 UI stuff 2014-10-05 10:59:52 +02:00
Vincent Breitmoser 7fedde2638 add support for hierarchical log entries 2014-10-05 10:09:50 +02:00
Dominik Schürmann 0b9308753d use status icons in public key selection 2014-10-05 04:09:55 +02:00
Dominik Schürmann d38b200b01 Add cloud icon 2014-10-05 03:39:44 +02:00
Vincent Breitmoser 84c624517c Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-05 02:25:36 +02:00
Dominik Schürmann 03fb3159b8 Give result down to list 2014-10-05 02:24:43 +02:00
Vincent Breitmoser 48c843beae even more layout neatification 2014-10-05 02:15:43 +02:00
Dominik Schürmann fa2b3054b0 Make bit size optional 2014-10-05 01:46:56 +02:00
Vincent Breitmoser 60fb3b60a8 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
2014-10-05 01:22:01 +02:00
Dominik Schürmann d99115c263 preselect certify key 2014-10-05 01:23:34 +02:00
Vincent Breitmoser dff68ac194 more layout neatification 2014-10-05 01:21:24 +02:00
Vincent Breitmoser 15165d056f slight layout changes to keyspinner_item 2014-10-05 01:07:32 +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
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 4ccb26d2e5 nfc: use proper hex encoding for pin length
Fixes #886
2014-09-26 00:39:48 +02:00
Vincent Breitmoser 9e2fc81c65 disable pull to refresh (for now) 2014-09-24 15:41:08 +02:00
Vincent Breitmoser 312598290b fix save button when no file is selected 2014-09-24 15:36:34 +02:00
Vincent Breitmoser 7c6eff6d92 show message about saving multiple files rather than hide the button 2014-09-24 15:28:51 +02:00
Vincent Breitmoser 689b2c9ab1 move more stuff into EncryptActivity superclass 2014-09-24 15:18:00 +02:00
Vincent Breitmoser e0da0f6eb5 use correct pin for nfc in EncryptActivity 2014-09-24 15:04:23 +02:00
Vincent Breitmoser c7b0f77c9b allow 1024 bit key signatures 2014-09-24 14:14:16 +02:00
Vincent Breitmoser da66d1443f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 12:30:15 +02:00
Vincent Breitmoser e4a7414794 fix Le fields in APDUs 2014-09-24 12:30:07 +02:00
Dominik Schürmann 5b0cc1fab4 Fix logging in NFcActivity 2014-09-24 11:57:50 +02:00
Vincent Breitmoser 5604deaca0 Fix yubikey pin lengths other than 6
Closes #883
2014-09-24 02:58:38 +02:00
Vincent Breitmoser 425cea41f2 add subtle attention seeker to decryptactivity with available clipboard data
Thanks Cyril Mottier

https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
2014-09-24 02:43:45 +02:00
Dominik Schürmann b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann f7d49a48cb Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 01:49:50 +02:00