cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,643 Commits 1 Branch 0 Tags
94114e35c2af9e264bfa6b3d458f6ceae77ab4f9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 2ae4d6ce05 pass through messenger to certify service from ViewKeyActivity 
the idea here is to handle progress and result of the CertifyActivity
directly in ViewKeyActivity by passing a messenger through to it. this
allows smoother transition from an uncertified to certified state.
 2015-02-28 04:34:08 +01:00
Vincent Breitmoser f3710b12f6 fab support for all notify types 2015-02-28 02:30:59 +01:00
Vincent Breitmoser e4d91de8d2 small Notify cleanup 2015-02-28 01:37:57 +01:00
Vincent Breitmoser 6ba03c0f13 clean up warnings in KeyListFragment 2015-02-28 01:32:15 +01:00
Vincent Breitmoser cc5b0dae06 collapse fab on action selected 
closes #1057
 2015-02-28 01:31:24 +01:00
Vincent Breitmoser d64b8f47d1 animate FAB to move up and down when a snackbar appears 2015-02-28 01:17:53 +01:00
Vincent Breitmoser 67093ccba2 forgot to commit FabContainer 2015-02-28 00:40:11 +01:00
Vincent Breitmoser 9c62c3fd39 control flow for moving the fab up with snackbar 2015-02-28 00:28:20 +01:00
Vincent Breitmoser c46fdef203 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:53:14 +01:00
Vincent Breitmoser 8cfba4c0fb slightly longer color fade duration 2015-02-27 23:52:51 +01:00
Vincent Breitmoser aec9bdfc1e transition status color in key view 2015-02-27 23:10:02 +01:00
Vincent Breitmoser 863f4e6ac1 hand through result in CertifyFingerprintActivity 2015-02-27 23:09:17 +01:00
Vincent Breitmoser 80c159056d show refresh key progress inline 2015-02-27 22:46:48 +01:00
Vincent Breitmoser 2cd7be6373 go to directly to certify screen after nfc import 2015-02-27 18:05:36 +01:00
Vincent Breitmoser a70d80483d add unit test for "no expiry where revoked user id still has expiry" case 2015-02-26 19:06:23 +01:00
Vincent Breitmoser 4ff8eca292 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-26 18:54:00 +01:00
Vincent Breitmoser 55dd6526a6 split up and mark unsafe expiry-related methods 2015-02-26 18:53:42 +01:00
Vincent Breitmoser e5bb7a35b5 save revocation instead of self-cert for revoked uids 2015-02-26 18:53:16 +01:00
Vincent Breitmoser d7888d4666 ignore revoked user ids for primary key expiry 2015-02-26 18:52:54 +01:00
Vincent Breitmoser ad8209bd94 pre-select certification key if only one is available 2015-02-26 10:48:17 +01:00
Vincent Breitmoser bb30cb5401 fix comments and some warnings in PgpDecryptVerify 2015-02-17 18:43:43 +01:00
Vincent Breitmoser 260ffdf588 add check for filesize to encrypt/decrypt tests 2015-02-17 18:09:07 +01:00
Vincent Breitmoser 3efaac2175 determine correct filesize during decryption from LiteralData packet 2015-02-17 18:08:45 +01:00
Vincent Breitmoser d125149bf7 fix tests for new PgpSignEncryptInput 2015-02-02 12:29:37 +01:00
Vincent Breitmoser 7b24ee7b55 rewrite PgpSignEncrypt data flow 
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
 2015-02-01 23:14:26 +01:00
Vincent Breitmoser 0b6dc65c97 Merge remote-tracking branch 'origin/development' into development 2015-01-31 18:49:54 +01:00
Vincent Breitmoser 5466d1e980 prevent recursive consolidate 2015-01-31 18:49:00 +01:00
Vincent Breitmoser 8c496287a2 update openpgp-api-lib for charset support 2015-01-27 09:46:13 +01:00
Vincent Breitmoser 6c80025ead backend support for charset in ascii-armored streams 2015-01-27 09:17:23 +01:00
Vincent Breitmoser efe5c80b1c remove unused NonPgpPartException 2015-01-26 16:33:10 +01:00
Vincent Breitmoser 2bb7c3bcef move last parts of import logic from kis into operation 2015-01-26 16:33:10 +01:00
Vincent Breitmoser b4781343d9 specify our usage of java 1.7 in build files 2015-01-25 12:41:03 +01:00
Vincent Breitmoser 8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Vincent Breitmoser 41aba69fad introduce PromoteKeyOperation to create dummy secret from public keys 2015-01-25 02:08:07 +01:00
Vincent Breitmoser 1516f951b7 work on divert-to-key and other keyring stuff 
- allow modifySecretKeyRing operation without passphrase, but a only
  restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
  divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
 2015-01-25 01:57:58 +01:00
Vincent Breitmoser fb2fa195bf allow explicit re-certification in SaveKeyringParcel 2015-01-24 23:11:54 +01:00
Vincent Breitmoser 0e0970c347 move key stripping into ChangeSubkey, support divert-to-card 2015-01-24 23:05:50 +01:00
Vincent Breitmoser 53955a8014 forgot another test case in prev. commit 2015-01-19 19:15:44 +01:00
Vincent Breitmoser 89969252fd fix unit test for new key flag behavior 2015-01-19 18:53:12 +01:00
Vincent Breitmoser a65edcdb2f only respect most recent signature for key flags 2015-01-19 18:31:57 +01:00
Vincent Breitmoser e71bd3d9dd always show revoked user ids last! 2015-01-19 18:31:57 +01:00
Vincent Breitmoser 198ddfeff7 use Notify helper everywhere, replace supertoasts with snackbar library 2015-01-19 15:43:35 +01:00
Vincent 491c12d5d3 No setContentView in onCreate for KeyListActivity 2015-01-16 15:41:43 +01:00
Vincent Breitmoser b6f0fb91da show notification if KeyListActivity is spawned with an EXTRA_RESULT 
Closes #1029

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2015-01-16 13:58:34 +01:00
Vincent Breitmoser 8ef104281b fix ambiguous column name in advanced key info 2015-01-14 14:12:49 +01:00
Vincent Breitmoser 2e04888d36 involve user attributes in unit tests for merge and canonicalize! 2015-01-14 13:25:38 +01:00
Vincent Breitmoser 73feaa974c small fixes to user attribute handling 2015-01-14 13:25:38 +01:00
Vincent Breitmoser bbc9d90c3e add basic tests for addition of user attributes 2015-01-14 13:25:38 +01:00
Vincent Breitmoser 4660608887 fix log entry for addition of user attributes 2015-01-14 13:25:38 +01:00
Vincent Breitmoser c57355b24a actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:03:02 +01:00
Vincent Breitmoser 2b1c5358b7 make user_ids table typed, with attribute_data support 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
 2015-01-14 00:02:53 +01:00
Vincent Breitmoser 33ab856214 update spongycastle with more public methods for WrappedUserAttribute 2015-01-13 20:53:38 +01:00
Vincent Breitmoser abd1211613 hack to make WrappedUserAttribute serializable 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
 2015-01-13 20:42:40 +01:00
Vincent Breitmoser 84eece622b support addition of user attributes 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-01-13 20:41:01 +01:00
Vincent Breitmoser 50e515c6cd add support for user attributes in merge() routine 2015-01-13 20:37:26 +01:00
Vincent Breitmoser fc85ef71a8 remove LinkedIdentity (committed earlier by accident) 2015-01-13 00:10:59 +01:00
Vincent Breitmoser fc3397de5d add support for user attributes (during canonicalization) 2015-01-12 20:08:35 +01:00
Vincent Breitmoser 0c3f9ae0a6 tests: add a couple of CertifyOperation test cases 2015-01-03 23:02:11 +01:00
Vincent Breitmoser 07251f35ae minor stuff 2015-01-03 23:01:57 +01:00
Vincent Breitmoser 47ace7cea3 make certify routines more robust (#1016) 2015-01-03 22:14:12 +01:00
Vincent Breitmoser 2192a6badd add more descriptive string about non-mdc encrypted data 2015-01-03 21:07:33 +01:00
Vincent Breitmoser 320f7d35ef encapsulate high level edit key into new operation class 2015-01-03 13:55:15 +01:00
Vincent Breitmoser 5057ea1744 deal with non-existent user ids during import (#994) 2015-01-02 14:28:03 +01:00
Vincent Breitmoser 9cf800bcd8 tests: add multiple keys with signature test case 2015-01-02 02:50:14 +01:00
Vincent Breitmoser 920fbdfb42 throw exception if no data is found in getGenericData 2015-01-02 02:24:11 +01:00
Vincent Breitmoser 56f2a3137b get rid of RuntimeException control flow in UncachedKeyRing.fromStream 2015-01-02 02:05:12 +01:00
Vincent Breitmoser b52fb90380 fix and test for bad certificate version numbers (#1012) 
closes #1012
 2015-01-02 01:58:16 +01:00
Vincent Breitmoser 704fc2dd45 tests: for export, check that a token local cert actually exists before export 2015-01-02 01:11:43 +01:00
Vincent Breitmoser 57e3266fa5 tests: add test for key export 2015-01-02 00:15:08 +01:00
Vincent Breitmoser 7223abcf0c extend canonicalize to strip local certificates on export 2015-01-02 00:07:05 +01:00
Vincent Breitmoser 1c1ae769ef small improvements regarding pin tests and logging 2015-01-01 21:13:07 +01:00
Vincent Breitmoser 2d38079574 add empty notation data packet only if necessary 2015-01-01 20:46:39 +01:00
Vincent Breitmoser 9f7b2472cf tests: be less verbose about inserting keyrings for encrypt/decrypt 2015-01-01 20:21:52 +01:00
Vincent Breitmoser 5e9d8ca8c6 tests: add multi key encryption/decryption test, new way for fake passphrase cache 2015-01-01 20:21:32 +01:00
Vincent Breitmoser bf537c4a81 fix unit tests (canonicalize after create) 2015-01-01 18:24:09 +01:00
Vincent Breitmoser 71c53f13ec fix small merge conflict oversight 2014-12-30 16:24:20 +01:00
Vincent Breitmoser 9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-12-30 13:09:27 +01:00
Vincent Breitmoser 2223cdd405 some small notation data fixes 2014-12-30 13:07:56 +01:00
Vincent Breitmoser 22ea1defa8 add test case for PIN unlock 2014-12-30 13:07:36 +01:00
Vincent Breitmoser 438405d3d2 add PIN as a SecretKeyType 2014-12-30 12:34:24 +01:00
Vincent Breitmoser 7524881a01 fix unit tests for ChangeUnlockParcel 2014-12-30 12:02:37 +01:00
Vincent Breitmoser 2a5ac4e67c Revert "Remove restriction for max parallel forks for gradle tests" 
This reverts commit ce34192dbb.

Conflicts:
	build.gradle
 2014-12-30 11:59:57 +01:00
Vincent Breitmoser c7b0b650c1 introduce handling of notation direct key signatures, and experimental pin notation packet 2014-12-30 00:44:12 +01:00
Vincent Breitmoser 576e6fd0cc introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities 2014-12-29 23:12:11 +01:00
Vincent Breitmoser 1886dd1790 export secret and public keys in separate armored blocks 2014-10-31 18:18:09 +01:00
Vincent Breitmoser 8720a21106 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 19:48:27 +01:00
Vincent Breitmoser 7017527999 forgot a thing for secret key export 2014-10-30 15:14:44 +01:00
Vincent Breitmoser a221464f38 Fix to preselect certification key if only one is available 
Closes #981
 2014-10-29 22:47:34 +01:00
Vincent Breitmoser 8b53bed6c0 remove unused ExchangeKeySpinner class 2014-10-29 22:45:49 +01:00
Vincent Breitmoser e1285eec7b Close stream on key export to avoid partial write (see #986) 2014-10-29 22:39:38 +01:00
Vincent Breitmoser 727783dd00 retrofit getBlob method of matrixcursor for android 2.3 2014-10-27 17:36:53 +01:00
Vincent Breitmoser 84b234af37 Display error on certification attempt with yubikey 
Closes #978
 2014-10-26 22:29:47 +01:00
Vincent Breitmoser ce58eb4b03 disable cancel button instead of hiding it on cancel prevention 2014-10-26 22:26:05 +01:00
Vincent Breitmoser 5ce89c4af8 fix consolidate if no secret key are present 2014-10-26 22:20:44 +01:00
Vincent Breitmoser 35c80ed429 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:01:00 +01:00
Vincent Breitmoser 082722a3cf prevent cancel dring consolidate, move logic into progressable 2014-10-26 22:00:57 +01:00
Vincent Breitmoser b8ed54bc69 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 05:25:54 +01:00
Vincent Breitmoser 84a57411a5 add descriptive text to safeslinger activity 2014-10-26 02:12:29 +01:00
Vincent Breitmoser d6b9fc27b7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 01:54:12 +02:00
Vincent Breitmoser 510ef40f55 implement upload of keyring after certification, check that option by default 2014-10-26 01:50:48 +02:00