cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,040 Commits 1 Branch 0 Tags
cb3c2b20086bbce4f338e458a00ab18e4dccc99f
Commit Graph
23 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mar-v-in 5601f1b76f Fix TAG in account service as well 2014-06-06 17:42:28 +02:00
mar-v-in 55ca0841f6 Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
mar-v-in 9d02bc85e2 Fix compile error introduced during merge 2014-06-06 00:51:24 +02:00
mar-v-in e2164f571e Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-05 23:56:29 +02:00
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
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
mar-v-in 7865b92285 ContactHelper can read email addresses from contact list 2014-05-26 20:24:13 +02:00
mar-v-in b0ca33da40 Change resource name and remove unneeded if from 44232af 2014-02-27 10:55:52 +01:00
mar-v-in 44232afe94 Show link to Market if no openpgp provider installed installed 
Issue #295
 2014-02-27 10:35:28 +01:00