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
|
1e45e5cd9a
|
code cleanup in ProviderHelper and UncachedKeyRing
|
2014-06-18 10:00:21 +02:00 |
|
Vincent Breitmoser
|
d8b0015d25
|
consolidate: add logging
|
2014-06-18 00:30:45 +02:00 |
|
Vincent Breitmoser
|
b4974d922e
|
consolidate: first draft
|
2014-06-18 00:30:45 +02:00 |
|
Vincent Breitmoser
|
adf15d4d16
|
import-log: don't count self certs as unknown
|
2014-06-18 00:25:52 +02:00 |
|
Vincent Breitmoser
|
c63f3c8a5d
|
prepare ProviderHelper for consolidation before insert
|
2014-06-18 00:21:11 +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
|
5c47143d64
|
new-edit: add new save keyring stuff
|
2014-06-17 20:11:54 +02:00 |
|
Vincent Breitmoser
|
a0f546739d
|
new-edit: remove old save keyring stuff
|
2014-06-17 20:03:58 +02:00 |
|
Vincent Breitmoser
|
02fbaaf858
|
import-log: clean up progress messages
|
2014-06-17 12:18:41 +02:00 |
|
Vincent Breitmoser
|
9058291c05
|
canonicalize: fix NullPointerException
|
2014-06-17 11:57:14 +02:00 |
|
Vincent Breitmoser
|
ffea551afc
|
drop invalid user ids and add fatal case(s)
|
2014-06-16 22:32:17 +02:00 |
|
Vincent Breitmoser
|
2f0e70587d
|
add more progress info from import routine
|
2014-06-16 22:00:57 +02:00 |
|
Vincent Breitmoser
|
109bea7542
|
import-log: distinguish master/subkeys, distinguish redundant/bad certs, more docs
|
2014-06-16 22:00:57 +02:00 |
|
Daniel Haß
|
da28c000ad
|
Changed license header
|
2014-06-16 13:19:34 +02:00 |
|
Daniel Haß
|
5bd0b5011e
|
Moved Notify class to utils
|
2014-06-16 13:13:43 +02:00 |
|
Daniel Haß
|
eeff0c7150
|
Removed unused import
|
2014-06-16 13:06:42 +02:00 |
|
Daniel Haß
|
76d733cbc7
|
Added notification area to decrypt content
|
2014-06-16 12:38:19 +02:00 |
|
Daniel Haß
|
e48d5e4474
|
Replaced AppMsg with notify wrapper call
|
2014-06-16 12:37:51 +02:00 |
|
Daniel Haß
|
998f616607
|
Added notification area as reusable layout
|
2014-06-16 12:37:37 +02:00 |
|
Daniel Haß
|
41545e5e52
|
Added notification wrapper for toast like notifys
|
2014-06-16 12:37:22 +02:00 |
|
Art O Cathain
|
63861fa60b
|
Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error
|
2014-06-14 13:16:39 +01: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
|
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
|
8d75d3e00e
|
import-log: use holder pattern in log fragment
|
2014-06-11 00:37:23 +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
|
7324bfcb53
|
import-log: add LogDisplay activity
|
2014-06-10 01:53:25 +02:00 |
|
Vincent Breitmoser
|
d73a3e2fa8
|
import-log: use supertoast in ImportKeyActivity
|
2014-06-10 01:52:38 +02:00 |
|
Vincent Breitmoser
|
cdc61c4392
|
canonicalize: first step(s)
|
2014-06-10 01:51:16 +02:00 |
|
Vincent Breitmoser
|
067ffa876d
|
import-log: add OperationResults, use it in ImportKeys operation
|
2014-06-10 01:31:28 +02:00 |
|