Dominik Schürmann
73a825a152
Really fix travis
2014-06-09 22:14:30 +02:00
Dominik Schürmann
cb3c2b2008
Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12
2014-06-09 22:09:30 +02:00
Dominik Schürmann
de6fe46eca
Fix travis for buildTools 19.1
2014-06-09 22:02:04 +02:00
Dominik Schürmann
fe1b8468a1
Update buildTools to 19.1
2014-06-09 21:55:32 +02:00
Dominik Schürmann
d530a7b0ee
Update buildTools to 19.1
2014-06-09 21:52:17 +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
36312b950a
Add dnsjava as submodule
2014-06-05 23:46:14 +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
Dominik Schürmann
255462def4
Merge pull request #646 from timbray/master
...
Clean up keyimport.ImportKeysListEntry
2014-06-05 21:02:19 +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
Dominik Schürmann
52f1f30846
Use fixed gradle versions
2014-06-04 10:22:05 +02:00
Dominik Schürmann
6cb791d567
Use fixed gradle versions
2014-06-04 10:21:28 +02:00
Dominik Schürmann
84d03dd514
Merge pull request #643 from open-keychain/v/dev
...
wrap bouncycastle objects and don't use them in android-related code
2014-06-03 13:06:49 +02:00
Vincent Breitmoser
4a47126f05
Merge remote-tracking branch 'origin/master' into edit-key-rewrite
2014-06-02 18:49:24 +02:00
Vincent Breitmoser
80779defb1
spongycastle: expose pskr constructor
2014-06-02 18:48:46 +02:00
Vincent Breitmoser
58edc0af67
wrapped-key-ring: add documentation
2014-06-02 13:49:11 +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
Dominik Schürmann
39997a802e
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-05-31 20:54:30 +02:00
Dominik Schürmann
6d1369be56
Pull from transifex
2014-05-31 20:49:56 +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
d4cdc36448
Merge branch 'hkps-support' into automatic-contact-discovery
2014-05-29 11:33:53 +02:00
mar-v-in
3417a7a2de
Store nice origin with keybase keys (that can't be interpreted as HKP server)
2014-05-29 10:34:50 +02:00
mar-v-in
518f3e1763
Make abstract methods in Keyserver public (implementations make them public anyway)
2014-05-29 10:33:15 +02:00
