Vincent Breitmoser
f456c8a17d
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-10-03 04:25:08 +02:00
Vincent Breitmoser
662cc53859
clean up PgpImportExport a bit
2014-10-03 04:25:00 +02:00
Vincent Breitmoser
00bbf8c267
move IteratorWithSize interface into ParcelableFileCache - much cleaner
2014-10-03 04:22:32 +02:00
Vincent Breitmoser
504064302b
actually use iterator interface for ParcelableFileCache in activities
2014-10-03 04:16:14 +02:00
Vincent Breitmoser
04c8d42436
get rid of two consolidate number preferences
2014-10-03 03:37:08 +02:00
Vincent Breitmoser
a91468565f
use iterator interface exclusively in ParcelableFileCache
2014-10-03 03:29:23 +02:00
Dominik Schürmann
4cfc7feb43
More beautifyKeyIdWithPrefix
2014-10-03 03:16:34 +02:00
Dominik Schürmann
ef7eab2c8b
Merge branch 'master' of github.com:open-keychain/open-keychain
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
2014-10-03 02:20:38 +02:00
Dominik Schürmann
b9dc21969f
Fix nullpointer with clipboard
2014-10-03 02:17:51 +02:00
Vincent Breitmoser
4b4e885e55
more getActivity() checks
2014-10-03 02:13:22 +02:00
Vincent Breitmoser
34e4dabea9
fix nullpointer with subtle attention seeker
2014-10-03 02:07:09 +02:00
Vincent Breitmoser
08bfc2ae73
fix hideKeyboard() in other activities as well, just to be safe
2014-10-02 19:40:43 +02:00
Vincent Breitmoser
a361e82a4d
fix NullPointerException in keyboard hack
2014-10-02 19:35:03 +02:00
Vincent Breitmoser
37cb5c4c78
make getSignId a secret key operation, and respect unavailable keys
...
This one should remedy #811 , but waiting for a test
2014-10-02 19:26:07 +02:00
Dominik Schürmann
8192bf99a6
mProgressDialogFragment null check
2014-10-02 14:05:54 +02:00
Dominik Schürmann
c2f85c7446
Remove unnecessary call to mFingerprintQrCode
2014-10-02 12:50:38 +02:00
Dominik Schürmann
6da367e469
Fix IllegalStateException in ViewKeyShareFragment
2014-10-02 12:43:18 +02:00
Dominik Schürmann
a125b51b1c
Fix nullpointer with getS2K()
2014-10-02 12:33:56 +02:00
Dominik Schürmann
675d2bd6dd
code style
2014-10-02 11:47:42 +02:00
Dominik Schürmann
8f616bcf0c
Add null check when retrieving key ids from contacts api
2014-10-02 11:32:10 +02:00
Dominik Schürmann
17e45d94a8
Add workaround for bug #912
2014-10-02 11:23:43 +02:00
Dominik Schürmann
42ce3bb0d3
Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen
2014-10-01 15:03:53 +02:00
Dominik Schürmann
e7cbf975ac
More debugging output
2014-10-01 14:14:50 +02:00
Dominik Schürmann
84fcbba74d
check key ids when used from api
2014-10-01 10:48:28 +02:00
Dominik Schürmann
b1b16b9313
3.0 beta3
2014-09-30 17:50:16 +02:00
Vincent Breitmoser
51ecce510f
fix minor logic error (haha)
2014-09-30 14:10:54 +02:00
Vincent Breitmoser
354bc87579
fix ByteBuffer offset mistake in NfcActivity
2014-09-30 11:36:51 +02:00
Vincent Breitmoser
b2b19d7b2b
pass (encryption) key id from Decrypt*Fragment to NfcActivity
2014-09-30 02:14:28 +02:00
Vincent Breitmoser
11d0f4510b
pass key id for check from EncryptActivity to NfcActivity
2014-09-30 02:03:17 +02:00
Vincent Breitmoser
bd3f6a22cb
add (optional) keyId check in NfcActivity
2014-09-30 01:47:04 +02:00
Vincent Breitmoser
dabdda36cf
revamp fingerprint and keyid methods in NfcActivity
2014-09-30 01:46:16 +02:00
Vincent Breitmoser
de5dd482e1
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-30 00:51:58 +02:00
Vincent Breitmoser
384724f9b5
request passphrase for correct subkey in OpenPgpService
...
fixes #811 , hopefully
2014-09-30 00:51:25 +02:00
Dominik Schürmann
9e7c9a0d32
Fix nullpointer in DecryptActivity
2014-09-29 23:05:17 +02:00
Dominik Schürmann
43140c10b1
Fixes for share to decrypt
2014-09-29 22:52:03 +02:00
Dominik Schürmann
51ea71d68a
Maybe fixes encrypt files on tablets
2014-09-29 22:23:48 +02:00
Vincent Breitmoser
0b16a4edfd
Merge remote-tracking branch 'origin/master'
...
Conflicts:
OpenKeychain/src/main/AndroidManifest.xml
2014-09-29 21:32:21 +02:00
Vincent Breitmoser
7f547afe42
add barely functional nfc intent activity (WIP!)
2014-09-29 21:31:19 +02:00
Vincent Breitmoser
c13a7b7eae
add class for proper nfc tlv packet parsing
2014-09-29 21:22:48 +02:00
Dominik Schürmann
f7fe236bd5
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-29 21:20:30 +02:00
Dominik Schürmann
654d98ac2a
Fix NfcActivity task stack problem
2014-09-29 21:20:01 +02:00
Vincent Breitmoser
c34a159cae
fix method visibility for tests
2014-09-28 15:17:09 +02:00
Vincent Breitmoser
8131daa638
move can.*() methods to CanonicalizedPublicKey, where they belong
2014-09-28 14:50:52 +02:00
Vincent Breitmoser
706e60474d
be more mindful of algorithm and usage flag interaction
...
Fixes #895
2014-09-28 14:25:54 +02:00
Vincent Breitmoser
c0abae5cc3
only check for primary binding certificate if key algorithm even supports signing
2014-09-28 03:53:14 +02:00
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
Vincent Breitmoser
9e2fc81c65
disable pull to refresh (for now)
2014-09-24 15:41:08 +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
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
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
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
Vincent Breitmoser
070017b12f
passphrasecache: cache by master key, introduce preference for cache by subkey
2014-09-23 15:56:48 +02:00
Vincent Breitmoser
9d9d71f3db
reject keys with duplicate subkeys altogether
...
closes #870
2014-09-23 01:36:46 +02:00
Vincent Breitmoser
3759d74ac8
add test case for duplicate keys in keyring ( #870 )
2014-09-23 01:32:36 +02:00
Vincent Breitmoser
862c9a8b3c
log "unspecified" flags differently
2014-09-22 17:02:53 +02:00
Vincent Breitmoser
f6ac887ce0
nicer code in key import for flag log types
2014-09-22 16:47:29 +02:00
Vincent Breitmoser
029ce91670
show authenticate flag in logs
2014-09-22 16:27:42 +02:00
Dominik Schürmann
d63fabace7
Hack to fix #805
2014-09-22 00:10:55 +02:00
Dominik Schürmann
fc4cdaa24b
Fix possible nullpointer in ImportKeysFileFragment
2014-09-21 23:25:41 +02:00
Dominik Schürmann
db7da6525e
Fix custom key configuration for primary user ids
2014-09-21 23:19:21 +02:00
Dominik Schürmann
f50c0e1905
Fix LogDisplayFragment
2014-09-21 22:56:16 +02:00
Dominik Schürmann
65c3d69d9a
Fix ConsolidateResult, needed parcelable methods
2014-09-21 22:31:28 +02:00
Dominik Schürmann
1dd68c7120
Merge pull request #871 from timbray/master
...
Handle absence of personal information in Keybase search result
2014-09-21 21:48:13 +02:00
Dominik Schürmann
bf0104af2e
Feature to change key configuration in create key
2014-09-21 21:50:56 +02:00