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,302 Commits 12 Branches 24 Tags 116 MiB
4da273ac16
Commit Graph

96 Commits

Author SHA1 Message Date
Vincent Breitmoser
4da273ac16 modifyKey: error out on nonexisting new primary user id 2014-07-11 13:35:48 +02:00
Vincent Breitmoser
dce2df4113 add come createKey strings 2014-07-11 02:48:54 +02:00
Dominik Schürmann
3363507be4 Bett API string 2014-07-04 09:52:25 +02:00
Dominik Schürmann
709196f774 Use strings in edit key 2014-07-03 16:49:25 +02:00
Dominik Schürmann
3085f0d229 Small strings fix 2014-07-03 16:24:10 +02:00
Dominik Schürmann
55f067b063 Work on edit 2014-07-03 15:06:05 +02:00
Vincent Breitmoser
100b5f4c5f Merge branch 'create-keyring' 2014-07-02 16:05:28 +02:00
Vincent Breitmoser
ebcd243e97 support changing primary user id in SaveKeyringParcel 
Closes #695
 2014-07-02 16:02:56 +02:00
Vincent Breitmoser
287b74885e don't use zero plural string for english 
closes #703
 2014-07-02 14:51:11 +02:00
Vincent Breitmoser
de698b8955 add create key capabilities to SaveKeyringParcel 2014-06-29 22:34:53 +02:00
Vincent Breitmoser
d6a2875816 code cleanup and plurals in import log entries 
closes #698
 2014-06-28 19:15:28 +02:00
Dominik Schürmann
9fe07478e7 Start work on a first-time wizard 2014-06-27 21:40:18 +02:00
Dominik Schürmann
e84aa5a69d Rename registered apps to apps 2014-06-24 13:54:24 +02:00
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