moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-19 07:15:06 -05:00
Code Issues Releases Wiki Activity
2,064 Commits 12 Branches 24 Tags 116 MiB
ca4774fd62
Commit Graph

76 Commits

Author SHA1 Message Date
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
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
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
067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
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
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
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
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
be490307f9 Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS 2014-05-29 10:24:00 +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
10ad7be46b wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type 2014-05-23 16:44:50 +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
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
19072824ba Rename KeyServer to Keyserver 2014-05-18 23:06:50 +02:00
Thialfihar
b8462de6e5 Rename fingerPrint to fingerprint 2014-05-14 17:22:53 +02:00
Vincent Breitmoser
2f95100d88 Merge remote-tracking branch 'origin/master' into wrapped-key-ring 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-05-14 16:02:28 +02:00
Thialfihar
6162247155 Add extraData property in ImportKeyListEntry 
This allows any KeyServer to store some extra data it might need.
In the case of KeybaseKeyServer it is the username, which then can
be grabbed directly, without the hack of storing it as userId.
 2014-05-14 14:28:41 +02:00
Daniel Haß
4ed8e45703 Removed unused Toast import 2014-05-11 22:20:44 +02:00
Daniel Haß
010dcf1887 Toast replacement 2014-05-11 22:15:45 +02:00
Vincent Breitmoser
cbc3988628 proper null checks and closing of cursors everywhere 2014-05-08 15:57:38 +02:00
Vincent Breitmoser
9c5c013538 use setEncryptToSigner for asymmetric encryption 
(tested and works, closes #569)
 2014-05-08 15:31:03 +02:00
Dominik Schürmann
ad791fd8f8 Move logic classes for import into own sub-package 2014-05-06 22:29:57 +02:00
Vincent Breitmoser
9baddb7d71 wrapped-key-ring: get rid of bc objects in key editor 2014-05-04 17:07:13 +02:00
Vincent Breitmoser
cd8af25ba7 wrapped-key-ring: more work on passphrase caching and certification 2014-05-04 16:59:20 +02:00
Vincent Breitmoser
b5647b2062 wrapped-key-ring: no more pgp imports in PassphraseDialogFragment 2014-05-04 03:38:58 +02:00
Vincent Breitmoser
f524fa692c wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentService! 2014-05-03 22:29:09 +02:00
Vincent Breitmoser
2176e1ef1c wrapped-key-ring: move more helper methods into keys 2014-05-03 19:04:23 +02:00
Vincent Breitmoser
1f8210f743 wrapped-key-ring: move certification logic into secretkey 2014-05-03 18:32:20 +02:00
Vincent Breitmoser
c2c6a90991 certification is always done with the master key 2014-05-03 15:59:25 +02:00
Tim Bray
18ed828608 tidy up IntentService 2014-04-30 13:49:48 -07:00