Commit Graph

20 Commits

Author SHA1 Message Date
Dominik Schürmann
8c7a360d6e Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +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
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
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
Vincent Breitmoser
cc1e4dce0a neatness refactoring 2014-06-04 20:27:25 +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
7865b92285 ContactHelper can read email addresses from contact list 2014-05-26 20:24:13 +02:00
Vincent Breitmoser
6d7daec37f wrapped-key-ring: use CachedKeyRing where possible 2014-05-21 21:41:51 +02:00
Vincent Breitmoser
cbc3988628 proper null checks and closing of cursors everywhere 2014-05-08 15:57:38 +02:00
Dominik Schürmann
e14ce09186 Better handling of actionbars back 2014-05-07 14:33:20 +02:00
Dominik Schürmann
1e22b28c2e Optimize imports 2014-04-15 22:52:21 +02:00
Dominik Schürmann
b04e6816f4 Removing remaining uses of Id, closing one of the oldest bugs #9 2014-04-14 13:48:20 +02:00
Dominik Schürmann
9daa2ae359 Update license header for 2014 2014-04-13 17:27:22 +02:00
Dominik Schürmann
094fb698de Refactor ProviderHelper to be non-static using a constructor based on context (first commit to get context out of pgp classes) 2014-04-11 17:45:52 +02:00
Vincent Breitmoser
baa3c86e12 split getMasterKeyId for the remaining use cases
Closes #549
2014-04-11 03:44:17 +02:00
Dominik Schürmann
a1efb24228 Introduce ProviderHelper.NotFoundException, remove dead code 2014-04-08 22:25:42 +02:00
Thialfihar
f2d8378d81 Change license from ASLv2 to GPLv3 where possible 2014-04-08 11:59:35 +02:00
Thialfihar
42faf0eb07 Update copyright timespan for Thialfihar 2014-04-08 11:59:35 +02:00
Dominik Schürmann
6d11371905 Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00