Daniel Haß
41545e5e52
Added notification wrapper for toast like notifys
2014-06-16 12:37:22 +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
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
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
d2430fe0e3
Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage
2014-06-06 22:47:28 +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
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
Vincent Breitmoser
c36b311d5f
import-log: better stripped key logging
2014-06-06 17:29:39 +02:00
Vincent Breitmoser
118225d7d2
import-log: add output to logcat (for debugging)
2014-06-06 17:28:36 +02:00
Vincent Breitmoser
e083ccc370
import-log: add import log string resources
2014-06-06 16:15:45 +02:00
Vincent Breitmoser
787f6edf32
import-log: add log statements in import routine
2014-06-06 16:15:27 +02:00
Vincent Breitmoser
b995b836a3
import-log: improve operationresultparcel, add indentation
2014-06-06 16:14:15 +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
Tim Bray
5466adee41
Clean up keyimport.ImportKeysListEntry
2014-06-05 11:58:18 -07:00
Dominik Schürmann
fc3a692002
Merge pull request #645 from timbray/master
...
Don't show full fingerprint in key search result lists
2014-06-05 18:16:29 +02:00
Tim Bray
7811970218
Don't show full fingerprint in key search results
2014-06-05 08:51:55 -07:00
Vincent Breitmoser
c84a1ecfff
import-log: add parcelable prototype
2014-06-05 14:17:49 +02:00
mar-v-in
dc1e26f39c
Make keylist case insensitive
...
You want "michael" to be next to "Michael", don't you?
2014-06-05 00:59:39 +02:00
Vincent Breitmoser
5ab0d76c69
ui: do show Certify identities button even for secret keys
...
Closes #636
2014-06-04 21:38:30 +02:00
Vincent Breitmoser
36bc0ae676
fix bug with bad verifying master keys
2014-06-04 21:35:36 +02:00
Vincent Breitmoser
2946d442e5
do respect expectedFingerprint during key import
2014-06-04 21:35:03 +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
6a63746278
Fix regex for hkp parsing to support multiple uids
2014-06-04 18:07:28 +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
cc2ef0c17c
Store expired state within ImportKeysListEntry
2014-06-04 18:05:16 +02:00
Tim Bray
54b7b0e522
fixed error message
2014-06-04 08:04:26 -07:00
Vincent Breitmoser
4a47126f05
Merge remote-tracking branch 'origin/master' into edit-key-rewrite
2014-06-02 18:49:24 +02:00
