cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,182 Commits 1 Branch 0 Tags
7fedde2638217d4aacbbe276ce50af7096222838
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 7fedde2638 add support for hierarchical log entries 2014-10-05 10:09:50 +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
Vincent Breitmoser 48c843beae even more layout neatification 2014-10-05 02:15:43 +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
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
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
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 2b436b9a19 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:16:58 +02:00
Vincent Breitmoser bad8aeea78 implement preliminary MultiCertifyActivity (most heavy lifting is done) 2014-10-04 23:16:51 +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
Vincent Breitmoser 7e5918efa3 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 16:02:18 +02:00
Vincent Breitmoser d004bf236b improve CertifyResult, add custom notify 2014-10-04 16:01:24 +02:00
Vincent Breitmoser 0e0e3d8dd0 redesign certify action to work with parcel input and result 2014-10-04 15:19:43 +02:00
Vincent Breitmoser dcd22d9815 keychainintentservice: rearrange actions in alphabetical order 2014-10-04 12:31:05 +02:00
Vincent Breitmoser c30c36fb2a add unit test for duplicate user ids (fix later!!) 2014-10-04 11:49:46 +02:00
Vincent Breitmoser ff144c7c11 canonicalize: compare user ids as string rather than bytes 2014-10-04 11:14:02 +02:00
Vincent Breitmoser 2b5341f0d4 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-10-03 23:10:37 +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
Vincent Breitmoser 228e5653f9 one more fix for getting the right subkey in api signing 2014-10-03 13:25:25 +02:00
Vincent Breitmoser 1ed6083a24 forgot adjustments in ProviderHelper 2014-10-03 04:42:01 +02:00
Vincent Breitmoser 5d6c2d90c2 fix unit test for ParcelableFileCache 2014-10-03 04:31:09 +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 662cc53859 clean up PgpImportExport a bit 2014-10-03 04:25:00 +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 04c8d42436 get rid of two consolidate number preferences 2014-10-03 03:37:08 +02:00
Vincent Breitmoser a91468565f use iterator interface exclusively in ParcelableFileCache 2014-10-03 03:29:23 +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
Vincent Breitmoser b6916a9b40 add test case for stripped master key, correct signing subkey should still be selected 2014-10-02 19:26:39 +02:00
Vincent Breitmoser 37cb5c4c78 make getSignId a secret key operation, and respect unavailable keys 
This one should remedy #811, but waiting for a test
 2014-10-02 19:26:07 +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
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
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
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
Vincent 9b250642dd Update CHANGELOG 2014-09-24 19:03:20 +02:00
Vincent Breitmoser f48db5a005 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 15:41:16 +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 a50fe142e4 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 15:31:37 +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
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
Vincent Breitmoser c871891f49 Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
 2014-09-24 01:42:17 +02:00
Vincent Breitmoser 7654cd54fb fix signing in OK with yubikeys 2014-09-24 01:41:40 +02:00
Vincent Breitmoser d588b13255 fix signatures produced by yubikey 
The timestamp was only set on a second run. This led to a race
condition whether the signature could be completed within the
same timestamp.

Fixes #834
 2014-09-24 01:37:28 +02:00
Vincent Breitmoser 07e8729abf fix nullpointer in previous swipetorefresh fix 2014-09-23 23:49:18 +02:00
Vincent Breitmoser ab4972b428 missed a secondary preference initialization 2014-09-23 19:17:54 +02:00
Vincent Breitmoser 5e090e6fb6 fix nullpointer ImportKeysListEntry (from pulltorefresh) 
Fixes #873
 2014-09-23 19:02:08 +02:00
Vincent Breitmoser 45b7b88b94 disable pull to refresh in upper right corner 
While at the top of the list, the scroll bar handle is in the top right
corner. Previously, dragging the handle from this position was difficult
because touch events were intercepted by the pull to refresh handler.

Closes #858
 2014-09-23 18:48:39 +02:00
Vincent Breitmoser c5239d6e9b be more precise on importresult overall error 2014-09-23 16:23:13 +02:00
Vincent Breitmoser da1779816b take failed keys into account in importkeyresult notification 2014-09-23 16:19:01 +02:00
Vincent Breitmoser bf9a708e84 fix test case for new PassphraeCacheInterface 2014-09-23 16:16:16 +02:00
Vincent Breitmoser 070017b12f passphrasecache: cache by master key, introduce preference for cache by subkey 2014-09-23 15:56:48 +02:00
Vincent Breitmoser 675e8e2015 add test case to make sure s2k IVs are different per subkey 2014-09-23 14:53:44 +02:00
Vincent Breitmoser 9d9d71f3db reject keys with duplicate subkeys altogether 
closes #870
 2014-09-23 01:36:46 +02:00
Vincent Breitmoser 3759d74ac8 add test case for duplicate keys in keyring (#870) 2014-09-23 01:32:36 +02:00
Vincent Breitmoser 862c9a8b3c log "unspecified" flags differently 2014-09-22 17:02:53 +02:00
Vincent Breitmoser f6ac887ce0 nicer code in key import for flag log types 2014-09-22 16:47:29 +02:00
Vincent Breitmoser 029ce91670 show authenticate flag in logs 2014-09-22 16:27:42 +02:00
Vincent Breitmoser 3f39cf92c6 stronger divert-to-card test case 2014-09-22 16:27:26 +02:00
Vincent Breitmoser 6062b5ef68 fix isLocal logic (f*ck yeah unit tests!) 2014-09-20 00:32:50 +02:00
Vincent Breitmoser 344bc1736d respect user id revocation signatures 
Closes #836
 2014-09-20 00:14:33 +02:00
Vincent Breitmoser 6536ca825b forgot a LogLevel piece 2014-09-19 21:40:45 +02:00
Vincent Breitmoser a3e7406b3d fix encrypt/decrypt classes 2014-09-17 14:32:14 +02:00
Vincent Breitmoser 9dc22ef510 start work on encrypt/decrypt test classes 2014-09-15 17:21:58 +02:00
Vincent Breitmoser 1f9bbff58d minor fix for passphrase test 2014-09-15 14:17:39 +02:00
Vincent Breitmoser e457d4c909 Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/res/values-de/strings.xml
 2014-09-15 14:00:17 +02:00
Vincent Breitmoser 9a3a032d99 move LogLevel info into LogType enum 2014-09-15 13:59:21 +02:00
Vincent Breitmoser 36ef8a9a62 work on OperationResultParcel 2014-09-14 01:14:58 +02:00
Vincent Breitmoser 03d103af07 pending results are a type of non-success 2014-09-14 00:55:50 +02:00
Vincent Breitmoser 760b05273c (forgot a file for previous commit) 2014-09-14 00:43:07 +02:00
Vincent Breitmoser f0e159a372 add SignEncryptResult parcel (probably break stuff) 2014-09-14 00:33:30 +02:00
Vincent Breitmoser 85d0f5b6d5 add key id to trailing asym data log msg 2014-09-13 22:27:22 +02:00
Vincent Breitmoser e2675caf23 just skip foreign uid certifications during import for now 
Related to #836, fix still pending
 2014-09-13 22:16:35 +02:00