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
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
Vincent Breitmoser
07e8729abf
fix nullpointer in previous swipetorefresh fix
2014-09-23 23:49: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
bf9a708e84
fix test case for new PassphraeCacheInterface
2014-09-23 16:16:16 +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
675e8e2015
add test case to make sure s2k IVs are different per subkey
2014-09-23 14:53:44 +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
Vincent Breitmoser
3f39cf92c6
stronger divert-to-card test case
2014-09-22 16:27:26 +02:00
Vincent Breitmoser
6062b5ef68
fix isLocal logic (f*ck yeah unit tests!)
2014-09-20 00:32:50 +02:00
Vincent Breitmoser
344bc1736d
respect user id revocation signatures
...
Closes #836
2014-09-20 00:14:33 +02:00
Vincent Breitmoser
6536ca825b
forgot a LogLevel piece
2014-09-19 21:40:45 +02:00
Vincent Breitmoser
a3e7406b3d
fix encrypt/decrypt classes
2014-09-17 14:32:14 +02:00
Vincent Breitmoser
9dc22ef510
start work on encrypt/decrypt test classes
2014-09-15 17:21:58 +02:00
Vincent Breitmoser
1f9bbff58d
minor fix for passphrase test
2014-09-15 14:17:39 +02:00
Vincent Breitmoser
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
Vincent Breitmoser
9a3a032d99
move LogLevel info into LogType enum
2014-09-15 13:59:21 +02:00
Vincent Breitmoser
36ef8a9a62
work on OperationResultParcel
2014-09-14 01:14:58 +02:00
Vincent Breitmoser
03d103af07
pending results are a type of non-success
2014-09-14 00:55:50 +02:00
Vincent Breitmoser
760b05273c
(forgot a file for previous commit)
2014-09-14 00:43:07 +02:00
Vincent Breitmoser
f0e159a372
add SignEncryptResult parcel (probably break stuff)
2014-09-14 00:33:30 +02:00
Vincent Breitmoser
85d0f5b6d5
add key id to trailing asym data log msg
2014-09-13 22:27:22 +02:00
Vincent Breitmoser
e2675caf23
just skip foreign uid certifications during import for now
...
Related to #836 , fix still pending
2014-09-13 22:16:35 +02:00
Vincent Breitmoser
9475c4d91a
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-13 22:09:12 +02:00
Vincent Breitmoser
ff65733ed3
move IS_REVOKED table prefix to the right places
...
Fixes #849
2014-09-13 22:08:53 +02:00
Vincent Breitmoser
3b8c171ecb
very small fix, don't show name on encoding warning
2014-09-13 21:47:04 +02:00
Vincent Breitmoser
b9a4148a07
Merge remote-tracking branch 'origin/master'
2014-09-13 21:43:49 +02:00
Vincent Breitmoser
8a188a79dc
log warning on bad uid encoding
2014-09-13 21:43:37 +02:00
Vincent Breitmoser
f8677a5f16
Merge branch 'result-parcels'
2014-09-13 21:32:17 +02:00
Vincent Breitmoser
7b08b18d25
some DecryptVerify log refinements
2014-09-13 21:29:29 +02:00
Vincent Breitmoser
efd9d1626e
add a ton of logging to DecryptVerify
2014-09-13 21:14:06 +02:00
Vincent Breitmoser
dbbefe2f41
working version of DecryptVerifyResult
2014-09-13 19:30:10 +02:00
Vincent Breitmoser
4c636a1471
introduce OperationResultParcel for PgpDecryptVerify operations (WIP)
2014-09-13 17:54:10 +02:00
Vincent Breitmoser
19252380f1
promote all result parcels to top level classes in their own package
2014-09-13 14:36:23 +02:00
Vincent Breitmoser
40c81c9429
fix key upload after certification (hopefully?)
2014-09-12 11:55:14 +02:00
Vincent Breitmoser
4e834d7833
add ui support for stripping subkeys
2014-09-11 22:50:44 +02:00
Vincent Breitmoser
8f6b7e27f1
editKey: add test case for previous commit
2014-09-11 22:49:39 +02:00
Vincent Breitmoser
f744488017
editKey: add support for sripping keys
2014-09-11 22:49:21 +02:00
Vincent Breitmoser
8e665d829e
merge: adapt testcase to previous commit
2014-09-11 22:48:22 +02:00
Vincent Breitmoser
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
Vincent Breitmoser
d61d846b72
add some comments to previous commit
2014-09-10 01:04:13 +02:00
Vincent Breitmoser
7dbb7cf1e1
jury-rig broken sign mechanism
...
Should improve situation on #811
2014-09-09 22:43:14 +02:00
Vincent Breitmoser
ceea2667e8
introduce SingletonResult for... singleton results
2014-09-08 14:50:16 +02:00
Vincent Breitmoser
055fb59ec3
Properly handle uneditable key types in EditKeyFragment
...
More specifically, return an OperationResultParcel for stripped and
divert-to-card keys, with an appropriate error message in the log.
part of #828
2014-09-08 14:35:15 +02:00
Vincent Breitmoser
0b091aa642
flag revoked, epired and unavailable keys in selection spinner
2014-09-07 18:49:29 +02:00
Vincent Breitmoser
597eb268f4
add error text on bad passphrase
2014-09-07 17:04:13 +02:00
Vincent Breitmoser
31cc004fe1
make EditKeyFragment work with new PassphraseDialog
2014-09-07 16:55:07 +02:00
Vincent Breitmoser
fd7bdbf54f
add proper async check for correct passphrase to passphrasedialog
2014-09-07 16:54:39 +02:00
Vincent Breitmoser
05e9eefda9
ditch public divert-to-card test keyring
2014-09-03 03:09:42 +02:00
Vincent Breitmoser
598a5e7439
implement test case for mailvelope keyring with no key flags
2014-09-03 03:05:18 +02:00
Vincent Breitmoser
6e219d245f
fix tests for changed key flag semantics
2014-09-03 02:55:35 +02:00
Vincent Breitmoser
7bc424a8cb
work on passphrase caching, make use of cached SecretKeyType data (WIP!)
2014-09-03 02:43:06 +02:00
Vincent Breitmoser
e9b14585f5
add getSecretKeyType method to CachedPublicKeyRing
2014-09-03 02:43:06 +02:00
Vincent Breitmoser
84d16bd1f7
add test for divert-to-card
2014-09-02 12:36:04 +02:00
Vincent Breitmoser
e0905a3afb
cache key s2k type in database, for later use
2014-09-02 01:24:16 +02:00
Vincent Breitmoser
a97ebc1ec9
Lock drawer in EncryptFileActivity if called from intent
...
Closes #810
2014-09-01 23:46:22 +02:00
Vincent Breitmoser
f8625f5310
rename EncryptMessageFragment -> EncryptTextFragment
2014-09-01 23:46:14 +02:00
Vincent Breitmoser
b3d3026de7
remove redundant check from EncryptFileActivity
2014-09-01 23:38:11 +02:00
Vincent Breitmoser
2ead78a1e5
split EncryptActivity into Encrypt{Text,File}Activity
2014-09-01 23:25:03 +02:00
Vincent Breitmoser
e26d7be7de
remove "sign" and "verify" from drawer texts
2014-09-01 22:07:14 +02:00
Vincent Breitmoser
6b5e65253c
small ui changes in encrypt
2014-09-01 21:43:15 +02:00
Vincent Breitmoser
6a3e7921cf
remove "by holding..." explanation from button text
2014-09-01 21:24:24 +02:00
Vincent Breitmoser
16a93038dd
remove broken(?) cancellation code
2014-09-01 21:23:05 +02:00
Vincent Breitmoser
e9a2f256b9
add cancel prevention mechanism, improve cancellation for key import
2014-08-31 20:05:19 +02:00
Vincent Breitmoser
d17b478a9e
don't make our service sticky
2014-08-31 19:31:21 +02:00
Vincent Breitmoser
e46bc24079
add cancel support to edit key action
2014-08-31 19:20:08 +02:00
Vincent Breitmoser
d483a8b73e
get rid of some last bootstrapbutton references
2014-08-31 19:01:28 +02:00
Vincent Breitmoser
06eb7148a2
Merge remote-tracking branch 'origin/master'
2014-08-31 17:37:45 +02:00
Vincent Breitmoser
7da7832284
Add cancelable mechanism and support in key import
...
Closes #323
2014-08-31 17:32:13 +02:00
Vincent Breitmoser
38c6cf045c
remember "show advanced tabs" setting
...
Closes #669
2014-08-31 00:39:37 +02:00
Vincent Breitmoser
a73abf57f1
if there is only one private key, use it fo certification by default
2014-08-31 00:19:59 +02:00
Vincent Breitmoser
0738a38bbe
use LoaderFragment for CertifyActivity
2014-08-31 00:19:16 +02:00
Vincent Breitmoser
56f760e3f8
ditch NullProgressable
2014-08-30 18:32:29 +02:00
Vincent Breitmoser
8981fcf93d
fix one log level
2014-08-30 17:22:20 +02:00
Vincent Breitmoser
07ecd38842
get rid of a deprecated method use
2014-08-30 17:12:12 +02:00
Vincent Breitmoser
b6203a2b3c
Merge remote-tracking branch 'dakid/master'
2014-08-30 17:03:47 +02:00
Vincent Breitmoser
5ff3043903
canonicalize: add check for algorithm type
...
closes #797
2014-08-30 17:00:58 +02:00
Vincent Breitmoser
ac080b21ef
show bitsizes in import key list again
...
closes #802
2014-08-30 15:45:36 +02:00
Vincent Breitmoser
cb2eb8aca2
small language fixes for previous commit
2014-08-27 15:42:09 +02:00
Vincent Breitmoser
783dae8804
add ecc support
2014-08-24 16:08:37 +02:00
Vincent Breitmoser
9f9c31868d
tests: fix non-deterministic testMasterModify
2014-08-23 12:13:28 +02:00
Vincent Breitmoser
08bdb0c5b9
update to tidy spongy-master
2014-08-23 11:59:21 +02:00
Vincent Breitmoser
ad9339b23d
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-21 00:02:33 +02:00
Vincent Breitmoser
63ca81d871
Copyright (C) 2014 Vincent Breitmoser
2014-08-21 00:02:27 +02:00
Vincent Breitmoser
ce4bfdf945
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-20 23:09:25 +02:00
Vincent Breitmoser
9c9fc5330a
small change to make android studio recognize a honeycomb-only block
2014-08-20 23:09:20 +02:00
Vincent Breitmoser
dcf268bcb2
move key deletion into KeychainIntentHandler
2014-08-20 23:08:52 +02:00
Vincent Breitmoser
945764b30f
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-20 22:38:28 +02:00
Vincent Breitmoser
dd1b27b28f
consolidate: small ui things
2014-08-20 21:52:54 +02:00