 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 |
|
|
Vincent Breitmoser
|
6c428fa6b5
|
make number of secret keys imported part of ImportResult parcel
|
2014-08-20 21:51:57 +02:00 |
|
|
Vincent Breitmoser
|
9122d43d0a
|
close actionmode in keylist on loading events (avoid inconsistent state)
|
2014-08-20 21:51:19 +02:00 |
|
|
Vincent Breitmoser
|
6ed0f667cd
|
consolidate: remove debug "breakpoint"
|
2014-08-20 21:29:11 +02:00 |
|
|
Vincent Breitmoser
|
2cc265390c
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 20:16:05 +02:00 |
|
|
Vincent Breitmoser
|
c296529049
|
modifyKey: small logging changes
|
2014-08-20 20:15:43 +02:00 |
|
|
Vincent Breitmoser
|
1e5ac82985
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 19:59:54 +02:00 |
|
|
Vincent Breitmoser
|
475293a116
|
consolidate: prevent concurrent calls of step 2
|
2014-08-20 19:59:45 +02:00 |
|
|
Vincent Breitmoser
|
2a96912a96
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 19:34:42 +02:00 |
|
|
Vincent Breitmoser
|
fe1f5489ff
|
consolidate: implement (mostly) recovery mode
|
2014-08-20 19:34:36 +02:00 |
|
|
Vincent Breitmoser
|
9aaaac068e
|
consolidate: use KeychainProvider for deletion operation
|
2014-08-20 19:31:51 +02:00 |
|
|
Vincent Breitmoser
|
9930ab7f6f
|
consolidate: a lot more log output, better recovery
|
2014-08-19 16:53:55 +02:00 |
|
|
Vincent Breitmoser
|
9fb1050fed
|
stub for consolidate recovery in KeychainApplication
|
2014-08-19 15:56:53 +02:00 |
|
|
Vincent Breitmoser
|
0422d48b61
|
add ProgressFixedScaler (forgot in a previous commit)
|
2014-08-19 15:55:53 +02:00 |
|
|
Vincent Breitmoser
|
a2ae318a1a
|
add OpenDialogActivity (stub)
|
2014-08-19 15:55:40 +02:00 |
|
|
Vincent Breitmoser
|
c725239a69
|
consolidate: split into two steps, can pick up at second step if anything fails
|
2014-08-19 15:45:59 +02:00 |
|
|
Vincent Breitmoser
|
6a3150d878
|
fix primary user id in master key flag modification
|
2014-08-19 14:42:40 +02:00 |
|
|
Vincent
|
56fb822034
|
Merge pull request #772 from mar-v-in/issue-729
Remove NoSwipeWrapContentViewPager
|
2014-08-17 15:46:27 +02:00 |
|
|
Vincent Breitmoser
|
14290c3ce9
|
consolidate: working implementation, lacking ui
|
2014-08-17 03:29:03 +02:00 |
|
|
Vincent Breitmoser
|
aa625d4fbf
|
parametrize FileImportCache for filename
|
2014-08-17 00:49:14 +02:00 |
|
|
Vincent Breitmoser
|
c00343d516
|
modify*Key: improve handling of passphrase modification (add tests, too)
|
2014-08-16 21:04:43 +02:00 |
|
|
Vincent Breitmoser
|
e38f6a2a46
|
use correct algorithm for signatures (actually fix heterogeneous subkeys)
|
2014-08-16 19:45:14 +02:00 |
|
|
Vincent Breitmoser
|
62b7d2d7d8
|
fix small log format string mistake for adding subkeys
closes #768
|
2014-08-16 19:31:26 +02:00 |
|
|
Vincent Breitmoser
|
2497722b48
|
fix travis tests (more), minor comment edits
|
2014-08-16 07:12:37 +02:00 |
|
|
Vincent Breitmoser
|
7c7ba21714
|
tests: add test for master key revocation
|
2014-08-16 07:06:07 +02:00 |
|
|
Vincent Breitmoser
|
6e84c72801
|
tests: more expected error types
|
2014-08-16 06:53:50 +02:00 |
|
|
Vincent Breitmoser
|
de0d95432e
|
typed expected failures and a couple minor things
|
2014-08-16 06:53:50 +02:00 |
|
|
Vincent Breitmoser
|
a943bebfdf
|
support for master key modifications, among other stuff
|
2014-08-16 06:53:50 +02:00 |
|
|
Vincent Breitmoser
|
1fa77d57d2
|
modifySecretKey: err out on "use previous" expiry date for (sub)key creation
|
2014-08-16 06:53:50 +02:00 |
|
|
Vincent Breitmoser
|
c54fe21f44
|
modifySecretKey: err out on revocation of nonexistent user id
|
2014-08-16 06:53:50 +02:00 |
|
|
Vincent Breitmoser
|
0708b573fc
|
test: even nicer code
|
2014-08-16 06:53:50 +02:00 |
|
|
Vincent Breitmoser
|
09d37a5fa6
|
fix keys with no expiry in ui code
|
2014-08-14 22:12:18 +02:00 |
|
|
Vincent Breitmoser
|
621978a7f5
|
explicitly add BouncyCastleProvider (fixes travis?)
|
2014-08-14 19:13:18 +02:00 |
|
|
Vincent Breitmoser
|
48935557e8
|
support changing expiry of subkeys to none
|
2014-08-14 19:12:29 +02:00 |
|
|
Vincent Breitmoser
|
6e7b999409
|
fix subkey certification canonicalization (why did the test not catch this?!)
|
2014-08-14 18:57:55 +02:00 |
|
|
Vincent Breitmoser
|
9af301ec77
|
handle modify and save errors in KeychainIntentResult
|
2014-08-14 17:12:17 +02:00 |
|
|
Vincent Breitmoser
|
9c03889390
|
tests: add ProviderHelperSaveTest, with long key id collision test
|
2014-08-14 17:10:40 +02:00 |
|
|
Vincent Breitmoser
|
2c408f679c
|
dem logix
|
2014-08-14 16:34:57 +02:00 |
|
|
Vincent Breitmoser
|
a19784ed7e
|
merge: check fingerprints on merge operation! (this needs a testcase!)
|
2014-08-14 16:28:03 +02:00 |
|
|
Vincent Breitmoser
|
d2b9e95c80
|
tests: cleaner code in PgpKeyOperationTest
|
2014-08-14 16:28:03 +02:00 |
|
|
Vincent Breitmoser
|
d4240f73f5
|
delete unused PgpConversionHelper
|
2014-08-04 00:39:59 +02:00 |
|
|
Vincent Breitmoser
|
80ed3464f4
|
small fix for MSG_MF_UID_ADD log entry
|
2014-08-01 17:52:27 +02:00 |
|
|
Vincent Breitmoser
|
f555447011
|
fix dumb mistake in modifySecretKey
|
2014-08-01 17:46:04 +02:00 |
|
|
Vincent Breitmoser
|
827a958e12
|
remove debug output about security providers (cleaner unit tests)
|
2014-08-01 17:00:08 +02:00 |
|
|
Vincent Breitmoser
|
c0edaf9a5e
|
make FileImportCache generic, iterable, and add unit test
|
2014-08-01 16:59:48 +02:00 |
|
|
Vincent Breitmoser
|
11e5261f07
|
move classes around a bit
|
2014-08-01 16:50:33 +02:00 |
|
|
Vincent Breitmoser
|
faf3868f01
|
lowercase all key ids from keyserver
|
2014-07-31 23:49:53 +02:00 |
|
|
Vincent Breitmoser
|
3d7cdf5428
|
move upload/update buttons from menu to buttons
|
2014-07-31 23:49:53 +02:00 |
|
|
Vincent Breitmoser
|
caad5d1fc1
|
fix bug in UploadKeyActivity, minor work on uri handling
|
2014-07-31 23:07:20 +02:00 |
|
|
Vincent Breitmoser
|
c5ce794ef7
|
more fixes on canonicalization and progress
|
2014-07-31 22:36:25 +02:00 |
|
|
Vincent Breitmoser
|
58c2ca6eb8
|
completely overengineer progress indication in {modify,create}SecretKeyRing methods
|
2014-07-31 20:59:50 +02:00 |
|
|
Vincent Breitmoser
|
d48e980946
|
avoid nullpointerexception in EditKeyResult
|
2014-07-31 19:27:26 +02:00 |
|
|
Vincent Breitmoser
|
acb5a70e44
|
fix fromStream method, properly recognize multiple concatenated streams
|
2014-07-31 19:27:26 +02:00 |
|
|
Vincent Breitmoser
|
b40081c364
|
always return an EditKeyResult in modifyKey method
|
2014-07-31 19:27:25 +02:00 |
|