cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,983 Commits 1 Branch 0 Tags
872491686632540d7e4196cc082a94a662204497
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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