moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-19 05:42:17 -05:00
Code Issues Releases Wiki Activity
2,143 Commits 12 Branches 24 Tags 116 MiB
9d20e68f11
Commit Graph

83 Commits

Author SHA1 Message Date
Dominik Schürmann
9d20e68f11 Revert hint_keybase_search 2014-06-22 10:59:50 +02:00
Tim Bray
17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Dominik Schürmann
717d66961b Fix onTouchEvent delegation, with workaround for Android bug 2014-06-20 15:39:27 +02:00
Vincent Breitmoser
4ad15739e2 canonicalize: missed two logging entries 2014-06-18 21:43:41 +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
d8b0015d25 consolidate: add logging 2014-06-18 00:30:45 +02:00
Dominik Schürmann
4d34361590 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 00:03:19 +02:00
Dominik Schürmann
8c7a360d6e Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +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
ffea551afc drop invalid user ids and add fatal case(s) 2014-06-16 22:32:17 +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
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
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
eac582a313 import-log: some cosmetics 2014-06-10 13:52:05 +02:00
Vincent Breitmoser
067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
Dominik Schürmann
90f9646f25 Merge pull request #650 from open-keychain/v/import-log 
Parcelable operation result with logging capabilities + import logging
 2014-06-06 23:07:06 +02:00
Dominik Schürmann
a0f43febbb Merge pull request #649 from mar-v-in/automatic-contact-discovery 
Automatic contact discovery and more
 2014-06-06 22:57:51 +02:00
Dominik Schürmann
341247d446 Hide subkeys, certs tabs in key view, checkable menu item to show/hide them 2014-06-06 22:46:39 +02:00
mar-v-in
55ca0841f6 Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
Vincent Breitmoser
c36b311d5f import-log: better stripped key logging 2014-06-06 17:29:39 +02:00
Vincent Breitmoser
e083ccc370 import-log: add import log string resources 2014-06-06 16:15:45 +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
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
4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite 2014-06-02 18:49:24 +02:00
Tim Bray
dfd5aa65a5 Add Log.d for QueryFailedException 2014-05-23 09:33:34 -07: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
Dominik Schürmann
b4a9d1a2db Add applications section to help 2014-05-07 18:31:31 +02:00
Dominik Schürmann
b771276611 Start app menu item for registered apps 2014-05-07 15:03:24 +02:00
Dominik Schürmann
f4cbd8cabb Design fixes for certification activity 2014-05-07 14:17:18 +02:00
Dominik Schürmann
fb0f3c4778 Use paste icon, clarify language once again 2014-05-07 10:59:16 +02:00
Dominik Schürmann
0155335a59 Clarify language 2014-05-07 09:29:02 +02:00
Dominik Schürmann
a36f7f80e2 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-07 09:05:38 +02:00