a29d6b0ef3
Import code, fix collision of key spinner with other loaders
2014-10-04 15:42:23 +02:00
0e0e3d8dd0
redesign certify action to work with parcel input and result
2014-10-04 15:19:43 +02:00
ba018d1f1b
yubikey: check with correct subkey id for sign operation
2014-10-04 15:13:38 +02:00
f0ee7ed4cf
New add keys activity
2014-10-04 13:44:34 +02:00
dcd22d9815
keychainintentservice: rearrange actions in alphabetical order
2014-10-04 12:31:05 +02:00
ff144c7c11
canonicalize: compare user ids as string rather than bytes
2014-10-04 11:14:02 +02:00
2b5341f0d4
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-10-03 23:10:37 +02:00
f03822fefd
fix nullpointer on button push while data is still loading
...
fixes #934
2014-10-03 23:08:32 +02:00
3dfef61de5
Fix string reference
2014-10-03 18:42:03 +02:00
d5c6e430a5
Null check for getSelectedEntries
2014-10-03 13:37:49 +02:00
228e5653f9
one more fix for getting the right subkey in api signing
2014-10-03 13:25:25 +02:00
1ed6083a24
forgot adjustments in ProviderHelper
2014-10-03 04:42:01 +02:00
f456c8a17d
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-10-03 04:25:08 +02:00
662cc53859
clean up PgpImportExport a bit
2014-10-03 04:25:00 +02:00
00bbf8c267
move IteratorWithSize interface into ParcelableFileCache - much cleaner
2014-10-03 04:22:32 +02:00
504064302b
actually use iterator interface for ParcelableFileCache in activities
2014-10-03 04:16:14 +02:00
04c8d42436
get rid of two consolidate number preferences
2014-10-03 03:37:08 +02:00
a91468565f
use iterator interface exclusively in ParcelableFileCache
2014-10-03 03:29:23 +02:00
4cfc7feb43
More beautifyKeyIdWithPrefix
2014-10-03 03:16:34 +02:00
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
b9dc21969f
Fix nullpointer with clipboard
2014-10-03 02:17:51 +02:00
4b4e885e55
more getActivity() checks
2014-10-03 02:13:22 +02:00
34e4dabea9
fix nullpointer with subtle attention seeker
2014-10-03 02:07:09 +02:00
08bfc2ae73
fix hideKeyboard() in other activities as well, just to be safe
2014-10-02 19:40:43 +02:00
a361e82a4d
fix NullPointerException in keyboard hack
2014-10-02 19:35:03 +02:00
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
8192bf99a6
mProgressDialogFragment null check
2014-10-02 14:05:54 +02:00
c2f85c7446
Remove unnecessary call to mFingerprintQrCode
2014-10-02 12:50:38 +02:00
6da367e469
Fix IllegalStateException in ViewKeyShareFragment
2014-10-02 12:43:18 +02:00
a125b51b1c
Fix nullpointer with getS2K()
2014-10-02 12:33:56 +02:00
675d2bd6dd
code style
2014-10-02 11:47:42 +02:00
8f616bcf0c
Add null check when retrieving key ids from contacts api
2014-10-02 11:32:10 +02:00
17e45d94a8
Add workaround for bug #912
2014-10-02 11:23:43 +02:00
42ce3bb0d3
Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen
2014-10-01 15:03:53 +02:00
e7cbf975ac
More debugging output
2014-10-01 14:14:50 +02:00
84fcbba74d
check key ids when used from api
2014-10-01 10:48:28 +02:00
b1b16b9313
3.0 beta3
2014-09-30 17:50:16 +02:00
51ecce510f
fix minor logic error (haha)
2014-09-30 14:10:54 +02:00
354bc87579
fix ByteBuffer offset mistake in NfcActivity
2014-09-30 11:36:51 +02:00
b2b19d7b2b
pass (encryption) key id from Decrypt*Fragment to NfcActivity
2014-09-30 02:14:28 +02:00
11d0f4510b
pass key id for check from EncryptActivity to NfcActivity
2014-09-30 02:03:17 +02:00
bd3f6a22cb
add (optional) keyId check in NfcActivity
2014-09-30 01:47:04 +02:00
dabdda36cf
revamp fingerprint and keyid methods in NfcActivity
2014-09-30 01:46:16 +02:00
de5dd482e1
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-30 00:51:58 +02:00
384724f9b5
request passphrase for correct subkey in OpenPgpService
...
fixes #811 , hopefully
2014-09-30 00:51:25 +02:00
9e7c9a0d32
Fix nullpointer in DecryptActivity
2014-09-29 23:05:17 +02:00
43140c10b1
Fixes for share to decrypt
2014-09-29 22:52:03 +02:00
51ea71d68a
Maybe fixes encrypt files on tablets
2014-09-29 22:23:48 +02:00
0b16a4edfd
Merge remote-tracking branch 'origin/master'
...
Conflicts:
OpenKeychain/src/main/AndroidManifest.xml
2014-09-29 21:32:21 +02:00
7f547afe42
add barely functional nfc intent activity (WIP!)
2014-09-29 21:31:19 +02:00
c13a7b7eae
add class for proper nfc tlv packet parsing
2014-09-29 21:22:48 +02:00
f7fe236bd5
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-29 21:20:30 +02:00
654d98ac2a
Fix NfcActivity task stack problem
2014-09-29 21:20:01 +02:00
c34a159cae
fix method visibility for tests
2014-09-28 15:17:09 +02:00
8131daa638
move can.*() methods to CanonicalizedPublicKey, where they belong
2014-09-28 14:50:52 +02:00
706e60474d
be more mindful of algorithm and usage flag interaction
...
Fixes #895
2014-09-28 14:25:54 +02:00
c0abae5cc3
only check for primary binding certificate if key algorithm even supports signing
2014-09-28 03:53:14 +02:00
4782d22e26
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-28 03:38:14 +02:00
1c3d0a58ea
Reject subkeys with no key flags and no primary key binding certificate
...
Closes #899
2014-09-28 03:34:25 +02:00
d20f657151
Hide keyboard after cloud search
2014-09-27 14:36:14 +02:00
f22bbbd96c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-27 13:52:05 +02:00
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
1a2ec1eb32
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-26 00:43:08 +02:00
4ccb26d2e5
nfc: use proper hex encoding for pin length
...
Fixes #886
2014-09-26 00:39:48 +02:00
6d70e1bfd1
Fix bug where Keybase extraData gets lost when SKS wins the search race.
2014-09-25 02:30:52 -07:00
999094934a
Fixes for new app list
2014-09-24 21:30:03 +02:00
9e2fc81c65
disable pull to refresh (for now)
2014-09-24 15:41:08 +02:00
312598290b
fix save button when no file is selected
2014-09-24 15:36:34 +02:00
a50fe142e4
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 15:31:37 +02:00
7c6eff6d92
show message about saving multiple files rather than hide the button
2014-09-24 15:28:51 +02:00
689b2c9ab1
move more stuff into EncryptActivity superclass
2014-09-24 15:18:00 +02:00
e0da0f6eb5
use correct pin for nfc in EncryptActivity
2014-09-24 15:04:23 +02:00
9dbb966b44
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 14:46:03 +02:00
e3a185f698
propose apps in apps list
2014-09-24 14:45:51 +02:00
c7b0f77c9b
allow 1024 bit key signatures
2014-09-24 14:14:16 +02:00
da66d1443f
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 12:30:15 +02:00
e4a7414794
fix Le fields in APDUs
2014-09-24 12:30:07 +02:00
5b0cc1fab4
Fix logging in NFcActivity
2014-09-24 11:57:50 +02:00
5604deaca0
Fix yubikey pin lengths other than 6
...
Closes #883
2014-09-24 02:58:38 +02:00
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
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
f7d49a48cb
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-24 01:49:50 +02:00
3850ddea08
DecryptFiles: Reset state for new file decrytion
2014-09-24 01:46:54 +02:00
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
7654cd54fb
fix signing in OK with yubikeys
2014-09-24 01:41:40 +02:00
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
7f2640711e
Fix yubikey file decryption
2014-09-24 01:18:14 +02:00
0182f7c951
Yubikey text decryption working
2014-09-24 00:57:57 +02:00
07704c2726
Yubikey decryption
2014-09-24 00:50:58 +02:00
7c82e1c728
DecryptFilesActivity
2014-09-24 00:02:00 +02:00
07e8729abf
fix nullpointer in previous swipetorefresh fix
2014-09-23 23:49:18 +02:00
0143b54e9e
Implement buttons in DecryptTextFragment
2014-09-23 23:38:30 +02:00
b9347ea9aa
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-23 23:04:27 +02:00
9f67b0fe54
DecryptTextActivity rework
2014-09-23 23:04:18 +02:00
ab4972b428
missed a secondary preference initialization
2014-09-23 19:17:54 +02:00
5e090e6fb6
fix nullpointer ImportKeysListEntry (from pulltorefresh)
...
Fixes #873
2014-09-23 19:02:08 +02:00
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
c5239d6e9b
be more precise on importresult overall error
2014-09-23 16:23:13 +02:00
da1779816b
take failed keys into account in importkeyresult notification
2014-09-23 16:19:01 +02:00
070017b12f
passphrasecache: cache by master key, introduce preference for cache by subkey
2014-09-23 15:56:48 +02:00
9d9d71f3db
reject keys with duplicate subkeys altogether
...
closes #870
2014-09-23 01:36:46 +02:00
3759d74ac8
add test case for duplicate keys in keyring ( #870 )
2014-09-23 01:32:36 +02:00
862c9a8b3c
log "unspecified" flags differently
2014-09-22 17:02:53 +02:00
f6ac887ce0
nicer code in key import for flag log types
2014-09-22 16:47:29 +02:00
029ce91670
show authenticate flag in logs
2014-09-22 16:27:42 +02:00
d63fabace7
Hack to fix #805
2014-09-22 00:10:55 +02:00
fc4cdaa24b
Fix possible nullpointer in ImportKeysFileFragment
2014-09-21 23:25:41 +02:00
db7da6525e
Fix custom key configuration for primary user ids
2014-09-21 23:19:21 +02:00
f50c0e1905
Fix LogDisplayFragment
2014-09-21 22:56:16 +02:00
65c3d69d9a
Fix ConsolidateResult, needed parcelable methods
2014-09-21 22:31:28 +02:00
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
bf0104af2e
Feature to change key configuration in create key
2014-09-21 21:50:56 +02:00
edf87d09cb
Handle absence of personal information in Keybase search result
2014-09-21 10:24:48 -07:00
d4387c0179
Add null check to getSecretKeyType
2014-09-21 18:27:03 +02:00
1f5f937d00
Small UI fixes
2014-09-21 18:10:51 +02:00
9bd3383b49
Merge user ids in import list for better display
2014-09-21 17:58:26 +02:00
1d38365a61
key spinner fixes
2014-09-21 12:03:25 +02:00
08ad0cb305
settings code cleanup
2014-09-21 11:02:29 +02:00
b06fe773cf
New key flags icons, subkey adapter redesign, support authanticate flag in database
2014-09-20 20:36:37 +02:00
da4a70c513
no monospace for key ids
2014-09-20 18:12:13 +02:00
6062b5ef68
fix isLocal logic (f*ck yeah unit tests!)
2014-09-20 00:32:50 +02:00
344bc1736d
respect user id revocation signatures
...
Closes #836
2014-09-20 00:14:33 +02:00
6536ca825b
forgot a LogLevel piece
2014-09-19 21:40:45 +02:00
1ad36e2dbd
Beautify key id (thanks to Tim Bray)
2014-09-19 13:44:17 +02:00
99bf77dd84
Remove certificate validation code from ViewCertActivity, they are already validated by import
2014-09-19 11:46:21 +02:00
a454bfd701
Use key icons in import, prettify items
2014-09-18 22:05:27 +02:00
a77c217b82
Fixes for nfc decrypt
2014-09-18 15:28:51 +02:00
1837dc89fa
Fix nfc signing
2014-09-18 14:54:25 +02:00
4dec8b2b76
Stop refreshing after all keys have been updated
2014-09-18 14:41:24 +02:00
e019752a28
Swipe-to-refresh fixes
2014-09-18 14:03:21 +02:00
ac66f6cc10
Swipe-to-refresh fixes
2014-09-18 13:55:23 +02:00
91e97d03a1
Fix sign via API
2014-09-18 13:19:57 +02:00
9586d6b9b8
Use key icons in spinners
2014-09-17 23:06:49 +02:00
b09d222f34
package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting
2014-09-17 21:51:25 +02:00
a139be29ba
PassphraseDialogActivity usage in Remote API
2014-09-17 21:36:38 +02:00
7d917fa39c
Fix cleartext verify
2014-09-17 21:26:08 +02:00
1abf167f80
Passphrase handling in encrypt
2014-09-17 20:40:02 +02:00
8724916866
Result parcel refactorings (WIP)
2014-09-17 15:08:02 +02:00
a3e7406b3d
fix encrypt/decrypt classes
2014-09-17 14:32:14 +02:00
27cc92cbef
Dont copy encrypted file to clipboard (dont know how that code ended up there)
2014-09-17 14:00:11 +02:00
d686c55a0a
Work on new result handling (WIP)
2014-09-17 13:45:16 +02:00
018ca6abad
Fix construction of algorithmID in Keybase result lists
2014-09-15 15:11:59 -07:00
1f9bbff58d
minor fix for passphrase test
2014-09-15 14:17:39 +02:00
e457d4c909
Merge remote-tracking branch 'origin/master'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
2014-09-15 14:00:17 +02:00
9a3a032d99
move LogLevel info into LogType enum
2014-09-15 13:59:21 +02:00
40751bceb5
Pull from transifex
2014-09-15 10:44:36 +02:00
deddb09c32
Fix build
2014-09-15 10:33:15 +02:00
67e572cf4f
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-15 10:20:01 +02:00
53bc417f8f
New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodable characters)
2014-09-15 10:19:55 +02:00
d1a26c5748
update for new plural origins on ImportKeyListEntry
2014-09-13 21:55:41 -07:00
c13ccda658
Keys found on multiple servers are now imported from all of them
2014-09-13 21:43:07 -07:00
7de86a09bc
Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that
2014-09-13 21:41:03 -07:00
1c32d1df88
Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
2014-09-13 21:41:03 -07:00
36ef8a9a62
work on OperationResultParcel
2014-09-14 01:14:58 +02:00
88bbce831c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-14 00:56:03 +02:00
03d103af07
pending results are a type of non-success
2014-09-14 00:55:50 +02:00
760b05273c
(forgot a file for previous commit)
2014-09-14 00:43:07 +02:00
f0e159a372
add SignEncryptResult parcel (probably break stuff)
2014-09-14 00:33:30 +02:00
db5d12800c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-14 00:11:28 +02:00
179f48a4de
First work on decrypt
2014-09-14 00:11:23 +02:00
0625a16cb5
Temporary fix for #848 , fixed pull2refresh bugs
2014-09-13 23:57:54 +02:00
d5c9021b89
Hack to disable overscroll effect of swipe to update
2014-09-13 23:08:04 +02:00
efdfd2544d
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 22:55:32 +02:00
c9fee47fb3
Custom actionbar to indicate swipe down effect
2014-09-13 22:55:27 +02:00
85d0f5b6d5
add key id to trailing asym data log msg
2014-09-13 22:27:22 +02:00
e2675caf23
just skip foreign uid certifications during import for now
...
Related to #836 , fix still pending
2014-09-13 22:16:35 +02:00
9475c4d91a
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 22:09:12 +02:00
ff65733ed3
move IS_REVOKED table prefix to the right places
...
Fixes #849
2014-09-13 22:08:53 +02:00
bcbf96e61b
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 22:02:11 +02:00
b67b6b7f87
Set literal data format tag to UTF8 when encrypting text
2014-09-13 21:59:47 +02:00
3b8c171ecb
very small fix, don't show name on encoding warning
2014-09-13 21:47:04 +02:00
8a188a79dc
log warning on bad uid encoding
2014-09-13 21:43:37 +02:00
f8677a5f16
Merge branch 'result-parcels'
2014-09-13 21:32:17 +02:00
7b08b18d25
some DecryptVerify log refinements
2014-09-13 21:29:29 +02:00
a1323a1a14
deactivate screenshots in new PassphraseDialogActivity
2014-09-13 21:17:19 +02:00
efd9d1626e
add a ton of logging to DecryptVerify
2014-09-13 21:14:06 +02:00
3bc3bc6d58
More smaller UI fixes
2014-09-13 21:01:47 +02:00
be4882f5c1
If expired/revoked, disable both encrypt buttons
2014-09-13 20:53:07 +02:00
143cd2bd13
Test for badly encoded user ids
2014-09-13 20:46:44 +02:00
a8a1f352a8
Add new PassphraseDialogActivity, a transparent activity that only holds the passphrase dialog
2014-09-13 20:29:08 +02:00
d73ea5f612
Fix share to encrypt text
2014-09-13 20:07:22 +02:00
7d41800e57
Use spannable directly instead of html conversion in SubkeysAdapter
2014-09-13 19:49:16 +02:00
cbed39c38c
Remove unused method in KeyUpdateHelper
2014-09-13 19:35:01 +02:00
dbbefe2f41
working version of DecryptVerifyResult
2014-09-13 19:30:10 +02:00
a41b9f08d0
Merge pull request #843 from da-kid/master
...
Implemented Pull2Refresh
2014-09-13 19:10:54 +02:00
9e37522bdd
Get certificates by raw user ids, be more liberal about accepted user id encodings
2014-09-13 19:05:53 +02:00
4c636a1471
introduce OperationResultParcel for PgpDecryptVerify operations (WIP)
2014-09-13 17:54:10 +02:00
974dc47d69
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 17:30:14 +02:00
aca9ecdb85
getSignaturesForID can return null, check this
2014-09-13 17:30:07 +02:00
a86ec573fa
Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers
2014-09-13 17:02:10 +02:00
19252380f1
promote all result parcels to top level classes in their own package
2014-09-13 14:36:23 +02:00
fd5e5afc9f
Implemented Pull2Refresh in the KeyListFragment
...
Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection
Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs
Added Pull2Refresh to the KeyListFragment
2014-09-12 22:44:45 +02:00
40c81c9429
fix key upload after certification (hopefully?)
2014-09-12 11:55:14 +02:00
4e834d7833
add ui support for stripping subkeys
2014-09-11 22:50:44 +02:00
f744488017
editKey: add support for sripping keys
2014-09-11 22:49:21 +02:00
2a6774b221
merge: add support for s2k dummy generation
...
if a public key gets merged into a secret one, and there are new
subkeys, the merge() routine now adds a newly generated, stripped secret
subkey instead.
2014-09-11 22:45:35 +02:00
51d6ad4394
nullpointer check in KeychainProvider
2014-09-11 13:16:35 +02:00
6eb715a5d9
nullpointer check in KeychainProvider
2014-09-11 13:13:35 +02:00
f18a8a20ac
Add newly discussed design decisions for passphrase cache service
2014-09-10 13:40:51 +02:00
d61d846b72
add some comments to previous commit
2014-09-10 01:04:13 +02:00
Dominik Schürmann