cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,275 Commits 1 Branch 0 Tags
78b0c5e74a13aa33ccbb7cbfff86f7a02d977429
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent BreitmoserandArt O Cathain 9971f9ad4c use KeyringTestHelper.diffKeyrings method for unit test 
Conflicts:
	OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
 2014-07-07 21:12:50 +01:00
Vincent BreitmoserandArt O Cathain 83e5a3d341 add diffKeyrings method 2014-07-07 21:08:48 +01:00
Vincent fed11b2647 Merge pull request #708 from artbristol/composition-not-inheritance 
Prefer composition to inheritance
 2014-07-06 20:39:05 +02:00
Vincent Breitmoser a920f9ce0c Merge remote-tracking branch 'origin/master' 2014-07-02 16:05:58 +02:00
Vincent Breitmoser 100b5f4c5f Merge branch 'create-keyring' 2014-07-02 16:05:28 +02:00
Vincent Breitmoser ebcd243e97 support changing primary user id in SaveKeyringParcel 
Closes #695
 2014-07-02 16:02:56 +02:00
Vincent Breitmoser 6f558add35 use expert create key for key creation testing (revert this later on!) 2014-07-02 15:05:02 +02:00
Vincent Breitmoser 9fb92c8642 fix subkey addition 2014-07-02 15:03:28 +02:00
Vincent Breitmoser 858be93f3d update spongycastle to include addSubkeyBindingCertification 2014-07-02 15:02:11 +02:00
Vincent Breitmoser 144a10a3d0 forgot a line in previous commit 2014-07-02 14:53:25 +02:00
Vincent Breitmoser 287b74885e don't use zero plural string for english 
closes #703
 2014-07-02 14:51:11 +02:00
Vincent Breitmoser de698b8955 add create key capabilities to SaveKeyringParcel 2014-06-29 22:34:53 +02:00
Vincent Breitmoser 6d7a9ec48a pass import results through to viewkeyactivity on update 2014-06-28 20:54:14 +02:00
Vincent Breitmoser 3acb7fb087 fix nullpointerexception in importkeyactivity 2014-06-28 20:54:13 +02:00
Vincent Breitmoser d6a2875816 code cleanup and plurals in import log entries 
closes #698
 2014-06-28 19:15:28 +02:00
Vincent c865de4002 Merge pull request #686 from mar-v-in/minidns 
Use minidns instead of dnsjava
 2014-06-23 23:16:25 +02:00
Vincent Breitmoser 9f947aefe6 ditch outdated certifyKey operation 2014-06-22 14:46:14 +02:00
Vincent Breitmoser 4d091d1784 use arraylists instead of arrays in savekeyringparcel 2014-06-22 14:45:40 +02:00
Vincent Breitmoser 37cee1322b fix indentation in various key import methods 2014-06-22 14:17:08 +02:00
Vincent Breitmoser 002a391a68 Merge remote-tracking branch 'origin/master' 2014-06-22 13:42:03 +02:00
Vincent Breitmoser 22ea9c6047 fix parcel method in ParcelableKeyRing 2014-06-22 13:41:54 +02:00
Vincent Breitmoser 857b15cbd5 use hashcode instead of keyid in import list (keyids may not be unique!) 2014-06-22 13:32:07 +02:00
Vincent BreitmoserandDominik Schürmann 0d644e37b1 import: forward motion events to activity regardless 2014-06-20 22:30:54 +02:00
Vincent f47bb1e8e2 Merge pull request #658 from artbristol/functional-testing 
Start on Robolectric integration test
 2014-06-20 00:44:31 +02:00
Vincent Breitmoser b40b429bc0 remove obsolete subkey binding check from signature verification 2014-06-19 00:14:28 +02:00
Vincent BreitmoserandDominik Schürmann 5c6139f57a forward touch events to pager in import activity 2014-06-18 22:57:56 +02:00
Vincent Breitmoser ada6a12174 fix key export 2014-06-18 21:54:59 +02:00
Vincent Breitmoser 4ad15739e2 canonicalize: missed two logging entries 2014-06-18 21:43:41 +02:00
Vincent Breitmoser 825f37eee4 Merge remote-tracking branch 'origin/master' 2014-06-18 21:14:39 +02:00
Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-06-18 21:09:04 +02:00
Vincent Breitmoser 3bffe4da55 generate public keyring from secret if not available 2014-06-18 20:55:44 +02:00
Vincent Breitmoser f8d895dea4 consolidate: almost sane logging 2014-06-18 20:27:59 +02:00
Vincent Breitmoser 134f8471c0 consolidate: add key import routines with consolidation 2014-06-18 19:39:16 +02:00
Vincent Breitmoser f80228a08d consolidate: make it work 2014-06-18 14:02:21 +02:00
Vincent Breitmoser 1e45e5cd9a code cleanup in ProviderHelper and UncachedKeyRing 2014-06-18 10:00:21 +02:00
Vincent Breitmoser d8b0015d25 consolidate: add logging 2014-06-18 00:30:45 +02:00
Vincent Breitmoser b4974d922e consolidate: first draft 2014-06-18 00:30:45 +02:00
Vincent Breitmoser adf15d4d16 import-log: don't count self certs as unknown 2014-06-18 00:25:52 +02:00
Vincent Breitmoser c63f3c8a5d prepare ProviderHelper for consolidation before insert 2014-06-18 00:21:11 +02:00
Vincent Breitmoser 0013199b2d handle database error on secret key insert 2014-06-17 23:46:02 +02:00
Vincent Breitmoser 6e4d0dede1 canonicalize: support secret keys 2014-06-17 23:25:45 +02:00
Vincent Breitmoser 4bff50bffc new-edit: add logging to modifySecretKeyRing operation 2014-06-17 21:23:24 +02:00
Vincent Breitmoser 5c47143d64 new-edit: add new save keyring stuff 2014-06-17 20:11:54 +02:00
Vincent Breitmoser a0f546739d new-edit: remove old save keyring stuff 2014-06-17 20:03:58 +02:00
Vincent Breitmoser 02fbaaf858 import-log: clean up progress messages 2014-06-17 12:18:41 +02:00
Vincent Breitmoser 9058291c05 canonicalize: fix NullPointerException 2014-06-17 11:57:14 +02:00
Vincent Breitmoser ffea551afc drop invalid user ids and add fatal case(s) 2014-06-16 22:32:17 +02:00
Vincent Breitmoser 2f0e70587d add more progress info from import routine 2014-06-16 22:00:57 +02:00
Vincent Breitmoser 109bea7542 import-log: distinguish master/subkeys, distinguish redundant/bad certs, more docs 2014-06-16 22:00:57 +02:00
Vincent Breitmoser 9d77790729 Merge branch 'canonicalize' 2014-06-13 00:33:13 +02:00
Vincent Breitmoser ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
 2014-06-13 00:27:40 +02:00
Vincent Breitmoser 073433fa74 canonicalize: require primary key binding certificates for signing subkeys 2014-06-12 23:10:44 +02:00
Vincent Breitmoser 79131be5f0 canonicalize: simplify import with info from canonicalization 2014-06-12 22:27:32 +02:00
Vincent Breitmoser 0594d9156e canonicalize: filter out future and local certificates 2014-06-12 21:57:03 +02:00
Vincent Breitmoser 9dd40b7238 import-log: more minor improvements 2014-06-12 21:12:21 +02:00
Vincent Breitmoser 59701250ba import: use wrapped keyring instead of uncached keyring for trust 2014-06-12 18:11:31 +02:00
Vincent Breitmoser e4a7d4f6e5 import-log: minor improvements 2014-06-12 18:10:48 +02:00
Vincent Breitmoser dae503284f canonicalize: more stuff 2014-06-12 17:38:48 +02:00
Vincent Breitmoser 466eddb005 canonicalize: implementation, first draft 2014-06-12 15:47:21 +02:00
Vincent Breitmoser dea98a4a7e import-log: properly distinguish return states 2014-06-12 12:36:58 +02:00
Vincent Breitmoser 47368f1d24 import-log: better way to check self trust, and fix log level filtering 2014-06-12 01:37:49 +02:00
Vincent Breitmoser 8d75d3e00e import-log: use holder pattern in log fragment 2014-06-11 00:37:23 +02:00
Vincent Breitmoser 3895c10a58 import-log: work on log fragment ui 2014-06-10 20:06:28 +02:00
Vincent Breitmoser f38556cab1 import-log: switch to flags instead of statuses for result int 2014-06-10 16:24:04 +02:00
Vincent Breitmoser e41e6ea0de import-log: more interface work 2014-06-10 15:27:26 +02:00
Vincent Breitmoser eac582a313 import-log: some cosmetics 2014-06-10 13:52:05 +02:00
Vincent Breitmoser 7324bfcb53 import-log: add LogDisplay activity 2014-06-10 01:53:25 +02:00
Vincent Breitmoser d73a3e2fa8 import-log: use supertoast in ImportKeyActivity 2014-06-10 01:52:38 +02:00
Vincent Breitmoser cdc61c4392 canonicalize: first step(s) 2014-06-10 01:51:16 +02:00
Vincent Breitmoser 067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
Vincent Breitmoser 97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
Vincent Breitmoser c36b311d5f import-log: better stripped key logging 2014-06-06 17:29:39 +02:00
Vincent Breitmoser 118225d7d2 import-log: add output to logcat (for debugging) 2014-06-06 17:28:36 +02:00
Vincent Breitmoser e083ccc370 import-log: add import log string resources 2014-06-06 16:15:45 +02:00
Vincent Breitmoser 787f6edf32 import-log: add log statements in import routine 2014-06-06 16:15:27 +02:00
Vincent Breitmoser b995b836a3 import-log: improve operationresultparcel, add indentation 2014-06-06 16:14:15 +02:00
Vincent Breitmoser c84a1ecfff import-log: add parcelable prototype 2014-06-05 14:17:49 +02:00
Vincent Breitmoser 5ab0d76c69 ui: do show Certify identities button even for secret keys 
Closes #636
 2014-06-04 21:38:30 +02:00
Vincent Breitmoser 36bc0ae676 fix bug with bad verifying master keys 2014-06-04 21:35:36 +02:00
Vincent Breitmoser 2946d442e5 do respect expectedFingerprint during key import 2014-06-04 21:35:03 +02:00
Vincent Breitmoser cc1e4dce0a neatness refactoring 2014-06-04 20:27:25 +02:00
Vincent Breitmoser 4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite 2014-06-02 18:49:24 +02:00
Vincent Breitmoser 80779defb1 spongycastle: expose pskr constructor 2014-06-02 18:48:46 +02:00
Vincent Breitmoser 58edc0af67 wrapped-key-ring: add documentation 2014-06-02 13:49:11 +02:00
Vincent Breitmoser d891f75339 make everything work again 2014-06-02 13:47:48 +02:00
Vincent Breitmoser e27048fe73 wrapped-key-ring: move key data around in ParcelableKeyRing instead of ImportKeysListEntry 2014-06-02 13:47:48 +02:00
Vincent Breitmoser ed8b62c32b wrapped-key-ring: no UncachedSecretKeyRing after all 2014-06-02 13:47:48 +02:00
Vincent Breitmoser a53da491c0 new savekeyring operation (mostly stub) 2014-05-27 13:56:30 +02:00
Vincent Breitmoser 6415290b2d introduce new SaveKeyringParcel 2014-05-27 13:56:28 +02:00
Vincent Breitmoser ce1c3d1a1e rename SaveKeyringParcel to OldSaveKeyringParcel 2014-05-27 13:53:01 +02:00
Vincent Breitmoser e7fa124108 update unit test support in build files 2014-05-27 13:52:58 +02:00
Vincent Breitmoser 4a6aaf1e83 fix missing userIds in ImportKeysListEntry 2014-05-27 13:49:39 +02:00
Vincent Breitmoser 97af8b2a01 wrapped-key-ring: forgot a part in PgpDecryptVerify 2014-05-23 17:04:15 +02:00
Vincent Breitmoser c107fc668f introduce WrappedSignature for the ViewCert* ui code 2014-05-23 16:48:41 +02:00
Vincent Breitmoser 91a8a6c2d1 wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoader 2014-05-23 16:48:03 +02:00
Vincent Breitmoser 10ad7be46b wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type 2014-05-23 16:44:50 +02:00
Vincent Breitmoser cd0aba9d43 wrapped-key-ring: encapsulate key flags 2014-05-22 13:05:02 +02:00
Vincent Breitmoser 952bb99a24 Merge remote-tracking branch 'origin/master' into wrapped-key-ring 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-05-21 23:06:51 +02:00
Vincent Breitmoser 6d7daec37f wrapped-key-ring: use CachedKeyRing where possible 2014-05-21 21:41:51 +02:00
Vincent Breitmoser ab6c47a9b3 use long rather than String to build uris by key 2014-05-21 21:26:35 +02:00