cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,013 Commits 1 Branch 0 Tags
36312b950aa2e3150ec9381c91850c63ed1c604b
Commit Graph
309 Commits
Author SHA1 Message Date
mar-v-in 36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
mar-v-in 80e9998640 Show keys with android contacts 
This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
 2014-06-05 23:22:21 +02:00
mar-v-in dc1e26f39c Make keylist case insensitive 
You want "michael" to be next to "Michael", don't you?
 2014-06-05 00:59:39 +02:00
mar-v-in cae0071342 Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-04 21:32:37 +02:00
mar-v-in 6a63746278 Fix regex for hkp parsing to support multiple uids 2014-06-04 18:07:28 +02:00
mar-v-in dd959876f4 First version of automatic contact discovery. 
TODO:
- Configuration (much of it)
- Enabled by default?
- Which keys to import? Current state: All non-revoked and non-expired with matching userid
- Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?)
- Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
 2014-06-04 18:05:16 +02:00
mar-v-in cc2ef0c17c Store expired state within ImportKeysListEntry 2014-06-04 18:05:16 +02:00
Dominik Schürmann 52f1f30846 Use fixed gradle versions 2014-06-04 10:22:05 +02:00
Dominik Schürmann 6cb791d567 Use fixed gradle versions 2014-06-04 10:21:28 +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 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
Dominik Schürmann 39997a802e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-31 20:54:30 +02:00
Dominik Schürmann 6d1369be56 Pull from transifex 2014-05-31 20:49:56 +02:00
mar-v-in 34b97cb136 Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS 2014-05-29 11:43:41 +02:00
mar-v-in d4cdc36448 Merge branch 'hkps-support' into automatic-contact-discovery 2014-05-29 11:33:53 +02:00
mar-v-in 3417a7a2de Store nice origin with keybase keys (that can't be interpreted as HKP server) 2014-05-29 10:34:50 +02:00
mar-v-in 518f3e1763 Make abstract methods in Keyserver public (implementations make them public anyway) 2014-05-29 10:33:15 +02:00
mar-v-in be490307f9 Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS 2014-05-29 10:24:00 +02:00
mar-v-in c676e53479 Fix url building to support certificate check on hkps servers 
Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
 2014-05-28 20:44:01 +02:00
mar-v-in cb92c9ccc8 Add hkps support 2014-05-27 21:16:52 +02:00
mar-v-in 8e5767f967 Store origin with ImportKeysListEntry 2014-05-27 20:17:49 +02:00
mar-v-in 3110122a85 Add ability to resolve HkpKeyserver from _hkp._tcp SRV record 2014-05-27 19:45:58 +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
mar-v-in 7865b92285 ContactHelper can read email addresses from contact list 2014-05-26 20:24:13 +02:00
Tim Bray 58da3d12b0 Finished cleaning up rebase conflicts post Keyserver exception refactor 2014-05-23 09:42:32 -07:00
Tim Bray 1ff3962acc Add Log.d for QueryFailedException 2014-05-23 09:34:37 -07:00
Tim Bray dfd5aa65a5 Add Log.d for QueryFailedException 2014-05-23 09:33:34 -07: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
Vincent Breitmoser 761d87b661 wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing 2014-05-21 21:07:32 +02:00
Dominik Schürmann 8a2ffd8f90 Layout fixes for key import 2014-05-19 00:10:34 +02:00
Dominik Schürmann 8e846dc132 Add license header to FixedDrawerLayout 2014-05-18 23:23:58 +02:00
Dominik Schürmann 6e9acafc6d Merge highlight keyserver pull request 2014-05-18 23:19:22 +02:00
Dominik Schürmann 19072824ba Rename KeyServer to Keyserver 2014-05-18 23:06:50 +02:00
Thialfihar 1386282840 Rename mCurQuery to mQuery for consistency 2014-05-16 11:38:43 +02:00
Thialfihar 84b754341d Use Highlighter instead of HighlightQueryCursorAdapter 2014-05-16 11:38:43 +02:00
Thialfihar 69ce66be94 Add highlighting to keyserver/keybase search 2014-05-16 11:38:43 +02:00