Vincent Breitmoser
4782d22e26
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-28 03:38:14 +02:00
Vincent Breitmoser
1c3d0a58ea
Reject subkeys with no key flags and no primary key binding certificate
...
Closes #899
2014-09-28 03:34:25 +02:00
Dominik Schürmann
d20f657151
Hide keyboard after cloud search
2014-09-27 14:36:14 +02:00
Dominik Schürmann
f22bbbd96c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-27 13:52:05 +02:00
Dominik Schürmann
1a7edc9925
Dont show keyboard by default in key creation to allow the user to get an overview what to type, use spannable where possible
2014-09-27 13:52:01 +02:00
Vincent Breitmoser
1a2ec1eb32
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-26 00:43:08 +02:00
Vincent Breitmoser
4ccb26d2e5
nfc: use proper hex encoding for pin length
...
Fixes #886
2014-09-26 00:39:48 +02:00
Tim Bray
6d70e1bfd1
Fix bug where Keybase extraData gets lost when SKS wins the search race.
2014-09-25 02:30:52 -07:00
Dominik Schürmann
999094934a
Fixes for new app list
2014-09-24 21:30:03 +02:00
Dominik Schürmann
d5a1e9bb66
3.0 beta1
2014-09-24 19:11:23 +02:00
Vincent Breitmoser
f48db5a005
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 15:41:16 +02:00
Vincent Breitmoser
9e2fc81c65
disable pull to refresh (for now)
2014-09-24 15:41:08 +02:00
Dominik Schürmann
8b663add04
Pull from transifex
2014-09-24 15:41:00 +02:00
Vincent Breitmoser
312598290b
fix save button when no file is selected
2014-09-24 15:36:34 +02:00
Vincent Breitmoser
a50fe142e4
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 15:31:37 +02:00
Vincent Breitmoser
7c6eff6d92
show message about saving multiple files rather than hide the button
2014-09-24 15:28:51 +02:00
Vincent Breitmoser
689b2c9ab1
move more stuff into EncryptActivity superclass
2014-09-24 15:18:00 +02:00
Vincent Breitmoser
e0da0f6eb5
use correct pin for nfc in EncryptActivity
2014-09-24 15:04:23 +02:00
Dominik Schürmann
9dbb966b44
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 14:46:03 +02:00
Dominik Schürmann
e3a185f698
propose apps in apps list
2014-09-24 14:45:51 +02:00
Vincent Breitmoser
c7b0f77c9b
allow 1024 bit key signatures
2014-09-24 14:14:16 +02:00
Vincent Breitmoser
da66d1443f
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 12:30:15 +02:00
Vincent Breitmoser
e4a7414794
fix Le fields in APDUs
2014-09-24 12:30:07 +02:00
Dominik Schürmann
5b0cc1fab4
Fix logging in NFcActivity
2014-09-24 11:57:50 +02:00
Vincent Breitmoser
5604deaca0
Fix yubikey pin lengths other than 6
...
Closes #883
2014-09-24 02:58:38 +02:00
Vincent Breitmoser
425cea41f2
add subtle attention seeker to decryptactivity with available clipboard data
...
Thanks Cyril Mottier
https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
2014-09-24 02:43:45 +02:00
Dominik Schürmann
382ae968d6
Fix strings reported by yahoe.001
2014-09-24 02:36:24 +02:00
Dominik Schürmann
c3e0b3e887
Fix NfcActivity typo
2014-09-24 02:11:41 +02:00
Dominik Schürmann
b373c866e7
Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate
2014-09-24 02:01:53 +02:00
Dominik Schürmann
f7d49a48cb
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 01:49:50 +02:00
Dominik Schürmann
3850ddea08
DecryptFiles: Reset state for new file decrytion
2014-09-24 01:46:54 +02:00
Vincent Breitmoser
c871891f49
Merge remote-tracking branch 'origin/master'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
2014-09-24 01:42:17 +02:00
Vincent Breitmoser
7654cd54fb
fix signing in OK with yubikeys
2014-09-24 01:41:40 +02:00
Dominik Schürmann
6e0938aa93
Fix new decrypt button
2014-09-24 01:41:38 +02:00
Dominik Schürmann
993046d12e
cleanup
2014-09-24 01:38:18 +02:00
Vincent Breitmoser
d588b13255
fix signatures produced by yubikey
...
The timestamp was only set on a second run. This led to a race
condition whether the signature could be completed within the
same timestamp.
Fixes #834
2014-09-24 01:37:28 +02:00
Dominik Schürmann
42a7cd5eb0
Button text for decrypt
2014-09-24 01:37:00 +02:00
Dominik Schürmann
7f2640711e
Fix yubikey file decryption
2014-09-24 01:18:14 +02:00
Dominik Schürmann
0182f7c951
Yubikey text decryption working
2014-09-24 00:57:57 +02:00
Dominik Schürmann
07704c2726
Yubikey decryption
2014-09-24 00:50:58 +02:00
Dominik Schürmann
7c82e1c728
DecryptFilesActivity
2014-09-24 00:02:00 +02:00
Vincent Breitmoser
07e8729abf
fix nullpointer in previous swipetorefresh fix
2014-09-23 23:49:18 +02:00
Dominik Schürmann
0143b54e9e
Implement buttons in DecryptTextFragment
2014-09-23 23:38:30 +02:00
Dominik Schürmann
b9347ea9aa
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-23 23:04:27 +02:00
Dominik Schürmann
9f67b0fe54
DecryptTextActivity rework
2014-09-23 23:04:18 +02:00
Vincent Breitmoser
ab4972b428
missed a secondary preference initialization
2014-09-23 19:17:54 +02:00
Vincent Breitmoser
5e090e6fb6
fix nullpointer ImportKeysListEntry (from pulltorefresh)
...
Fixes #873
2014-09-23 19:02:08 +02:00
Vincent Breitmoser
45b7b88b94
disable pull to refresh in upper right corner
...
While at the top of the list, the scroll bar handle is in the top right
corner. Previously, dragging the handle from this position was difficult
because touch events were intercepted by the pull to refresh handler.
Closes #858
2014-09-23 18:48:39 +02:00
Vincent Breitmoser
c5239d6e9b
be more precise on importresult overall error
2014-09-23 16:23:13 +02:00
Vincent Breitmoser
da1779816b
take failed keys into account in importkeyresult notification
2014-09-23 16:19:01 +02:00