Dominik Schürmann
8f4e66348d
Merge pull request #681 from timbray/master
...
Handle empty keybase.io query, should fix #675
2014-06-23 13:42:58 +02:00
Dominik Schürmann
e8b96d1035
Disable pre-dexing, causes exceptions on some systems
2014-06-23 13:44:25 +02:00
Tim Bray
b48f727f98
Handle empty keybase.io query, should fix #675
2014-06-22 22:37:05 -07:00
mar-v-in
a14c041642
Add TlsHelper (designed to be used with sks-keyservers.net)
...
We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
2014-06-23 01:59:20 +02:00
Dominik Schürmann
514a4c668b
new edit key: change passphrase
2014-06-22 18:26:17 +02:00
Dominik Schürmann
b43fb63753
new edit key: diff for existing user ids
2014-06-22 18:12:04 +02:00
mar-v-in
9e7e0be82c
Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more
2014-06-22 16:45:07 +02:00
mar-v-in
79fb23b095
Improve file more, Part 1
...
- Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be)
- Show sdcard in side menu in storage API #665
- Propose filename with gpg ending when storing it using the storage API #665
- Don't show output dialog on Android 4.4 #665
- Only show filename on Android < 4.4 #665
TODO:
- File deletion for Android < 4.4
- Testing (especially with Android < 4.4)
- Batch-encryption
- UI
- Temporary content provider (see #665 discussion)
2014-06-22 16:31:28 +02:00
Dominik Schürmann
4db0194e6a
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-06-22 16:03:13 +02:00
Dominik Schürmann
106e1fcf03
Rename adapter
2014-06-22 16:03:03 +02:00
Vincent Breitmoser
9f947aefe6
ditch outdated certifyKey operation
2014-06-22 14:46:14 +02:00
Vincent Breitmoser
4d091d1784
use arraylists instead of arrays in savekeyringparcel
2014-06-22 14:45:40 +02:00
Vincent Breitmoser
37cee1322b
fix indentation in various key import methods
2014-06-22 14:17:08 +02:00
Vincent Breitmoser
002a391a68
Merge remote-tracking branch 'origin/master'
2014-06-22 13:42:03 +02:00
Vincent Breitmoser
22ea9c6047
fix parcel method in ParcelableKeyRing
2014-06-22 13:41:54 +02:00
Dominik Schürmann
c52828d247
add buttons in edit key
2014-06-22 13:33:50 +02:00
Vincent Breitmoser
857b15cbd5
use hashcode instead of keyid in import list (keyids may not be unique!)
2014-06-22 13:32:07 +02:00
Dominik Schürmann
012b895e4f
Update lib
2014-06-22 12:03:40 +02:00
Dominik Schürmann
9d20e68f11
Revert hint_keybase_search
2014-06-22 10:59:50 +02:00
Dominik Schürmann
4cc127e460
Merge pull request #672 from artbristol/functional-testing
...
VERY basic test for save keyring
2014-06-21 21:31:25 +02:00
Dominik Schürmann
0c3a478a43
Cleanup pull keybase code
2014-06-21 21:31:00 +02:00
Dominik Schürmann
4ae5c56b73
Merge pull request #668 from timbray/master
...
Moved Keybase stuff into KeybaseLib submodule
2014-06-21 21:25:03 +02:00
Dominik Schürmann
18430bef17
Start new designed activity
2014-06-21 20:25:51 +02:00
Tim Bray
1e72f2cba5
Committed submodule
2014-06-21 10:32:11 -07:00
Art O Cathain
0af2b27cb3
VERY basic test for save keyring
2014-06-21 17:44:04 +01:00
Dominik Schürmann
a1525bffe2
Fix qr code finally
2014-06-20 23:01:35 +02:00
Vincent Breitmoser
0d644e37b1
import: forward motion events to activity regardless
2014-06-20 22:30:54 +02:00
Dominik Schürmann
0a790c7aa2
Work on Qr code import
2014-06-20 22:28:08 +02:00
Tim Bray
17f43ad21b
Moved Keybase stuff into KeybaseLib submodule
2014-06-20 09:31:34 -07:00
Dominik Schürmann
6b7aa2767a
Fix keybase import
2014-06-20 15:58:32 +02:00
Dominik Schürmann
f0b8261ad3
Use actionbar button for log activity
2014-06-20 15:49:54 +02:00
Dominik Schürmann
717d66961b
Fix onTouchEvent delegation, with workaround for Android bug
2014-06-20 15:39:27 +02:00
Dominik Schürmann
4aec28c237
Fix update from keyserver flow
2014-06-20 15:14:34 +02:00
Vincent
f47bb1e8e2
Merge pull request #658 from artbristol/functional-testing
...
Start on Robolectric integration test
2014-06-20 00:44:31 +02:00
Dominik Schürmann
313e571a61
Merge pull request #664 from mar-v-in/improve-file
...
Add Document/Storage API support
2014-06-19 17:07:52 +02:00
mar-v-in
58706425d6
Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file
2014-06-19 13:57:35 +02:00
Dominik Schürmann
48c96184dc
Fix app name in PGP header, closing #663
2014-06-19 11:56:36 +02:00
Art O Cathain
b1815ef24a
revert to previous min version
2014-06-19 07:52:37 +01:00
Dominik Schürmann
3d8e6b303c
Fixing fingerprint search, part 1
2014-06-19 01:26:21 +02:00
Dominik Schürmann
47edcacf61
Remove unused code to import splitted qr codes
2014-06-19 00:54:52 +02:00
Dominik Schürmann
f0487b0ca7
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-06-19 00:38:47 +02:00
Dominik Schürmann
7fc188dbd6
New callback model for ImportKeysActivity
2014-06-19 00:38:36 +02:00
Vincent Breitmoser
b40b429bc0
remove obsolete subkey binding check from signature verification
2014-06-19 00:14:28 +02:00
Dominik Schürmann
0db425b289
Reference ic_launcher instead of icon
2014-06-18 23:19:54 +02:00
Dominik Schürmann
bce874db09
decrease size of search icons in import
2014-06-18 23:06:58 +02:00
Vincent Breitmoser
5c6139f57a
forward touch events to pager in import activity
2014-06-18 22:57:56 +02:00
Dominik Schürmann
a246dc9675
Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions
2014-06-18 22:30:54 +02:00
Dominik Schürmann
37a81af748
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-06-18 22:02:07 +02:00
Dominik Schürmann
d9ccef4899
consistent button design in import activity
2014-06-18 22:01:58 +02:00
Vincent Breitmoser
ada6a12174
fix key export
2014-06-18 21:54:59 +02:00