cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,298 Commits 1 Branch 0 Tags
c8790f404aaf76db967a16c8fea79eb6f90c8bce
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser c8790f404a multi-decrypt: switch to cardview 2015-06-10 17:40:00 +02:00
Vincent Breitmoser a48de4cd84 fix progress for decrypt 2015-06-10 17:39:06 +02:00
Vincent Breitmoser 1697e22d19 Merge branch 'v/eventbus' into v/multi-decrypt 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
 2015-06-10 17:12:22 +02:00
Vincent Breitmoser 8da88f33bc fix unit tests 2015-06-10 17:09:55 +02:00
Vincent Breitmoser 61dce088c2 backport CryptoOperationFragment changes without eventbus 2015-06-10 15:45:10 +02:00
Vincent Breitmoser 9b6416943b Merge remote-tracking branch 'origin/master' into v/eventbus 2015-06-10 14:49:02 +02:00
Vincent Breitmoser 0505af7520 select correct item in drawer on backstack change in main activity 2015-06-08 16:18:16 +02:00
Vincent Breitmoser d43671b2ed multi-decrypt: fix progress with new CryptoFragment interfaces 2015-06-07 02:00:14 +02:00
Vincent Breitmoser cfa2ecca61 WIP! Merge branch 'v/eventbus' into v/multi-decrypt 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
 2015-06-07 00:05:14 +02:00
Vincent Breitmoser b779211f55 Merge branch 'master' into v/multi-decrypt 
this also fixes weird-bug

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-06-06 23:40:22 +02:00
Vincent Breitmoser 074b6633b0 eventbus: initial attempt, replace messenger hack with eventbus communication 2015-06-06 23:17:42 +02:00
Vincent Breitmoser fa61438306 multi-decrypt: implement save operation (missing actual copy) 2015-06-03 17:01:29 +02:00
Vincent Breitmoser 6db9de221c multi-decrypt: working context menu 2015-06-03 16:47:46 +02:00
Vincent Breitmoser 5496b42fe6 get back to a working state 2015-06-03 02:04:43 +02:00
Vincent Breitmoser 5917303c1d update spongycastle with branch-specific patch stack 2015-06-03 01:38:40 +02:00
Vincent Breitmoser 7cfc0d80d0 Merge branch 'v/sticky-prefs' 2015-06-03 01:23:51 +02:00
Vincent Breitmoser ecfbc743f3 keep prefernces individual per dialog (affects only compression) 2015-06-03 01:21:06 +02:00
Vincent Breitmoser bd5a5c0138 Partially revert "switch to native DialogFragment, fix some nullpointers", but keep nullpointer fixes 
This reverts commit 403f74f558.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
 2015-06-03 01:16:44 +02:00
Vincent Breitmoser b3ebb64666 hide invoke nfc button in android < 5 2015-06-03 01:08:32 +02:00
Vincent Breitmoser 441704f163 multi-decrypt: working in principle 2015-06-02 22:19:28 +02:00
Vincent Breitmoser fc9a7bfcb3 multi-decrypt: working recyclerview which decrypt files sequentially, ui in progress 2015-06-02 12:14:27 +02:00
Vincent Breitmoser 04d6fd62c8 check for cached session keys in some tests 2015-06-01 12:02:05 +02:00
Vincent Breitmoser cee1a8c753 multi-decrypt: first steps, split up DecryptFilesFragment 2015-06-01 03:23:51 +02:00
Vincent Breitmoser dbfa55f6b9 introduce CachingDataDecryptorFactory towards cached session keys 
this commit introduces the CachingDataDecryptorFactory, which wraps
a DataDecryptorFactory but supports caching of decrypted session keys.

this change also gets rid of runtimeexception based control flow in
PgpDecryptVerify.
 2015-06-01 00:52:18 +02:00
Vincent Breitmoser 403f74f558 switch to native DialogFragment, fix some nullpointers 2015-05-31 19:45:25 +02:00
Vincent Breitmoser 204893a025 fix small non-deterministic failure case in unit test 2015-05-31 05:41:18 +02:00
Vincent Breitmoser 1bc14ab6ae revert some accidentally committed cruft 2015-05-31 05:22:14 +02:00
Vincent Breitmoser cf5fadae76 implement sticky preferences 2015-05-31 05:18:58 +02:00
Vincent Breitmoser 3976eadf06 handle empty passphrases in PassphraseDialogActivity 2015-05-31 05:16:41 +02:00
Vincent 5d87872245 Merge pull request #1318 from adithyaphilip/remove-nan 
Prevent NaN Progress Dialog on import with no selected keys
 2015-05-30 23:16:07 +02:00
Vincent Breitmoser 3be44898db only promote subkeys which are actually present 2015-05-30 14:08:49 +02:00
Vincent Breitmoser ef209450c6 some decrypt/verify bug fixes 2015-05-30 13:52:56 +02:00
Vincent Breitmoser 99fe806ea3 adapt unit tests to PgpDecryptVerifyInputParcel 2015-05-30 13:52:35 +02:00
Vincent Breitmoser 0d8370be1d rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel 2015-05-30 13:25:47 +02:00
Vincent Breitmoser 36ecd60c1b better error handling for bad encrypted data checksum 2015-05-30 13:09:09 +02:00
Vincent Breitmoser bde58c6ff1 delete correct cache entries (important for yubikey pins!) 2015-05-30 02:47:14 +02:00
Vincent Breitmoser 61a6346f89 show status indicators in EncryptFragment 2015-05-30 02:24:45 +02:00
Vincent Breitmoser 313b4ac7d3 rewrite data flow in EncryptFileFragment preserve state correctly 2015-05-30 00:20:11 +02:00
Vincent Breitmoser b9563ff2ef externalize caching functionality from CertifyKeyFragment 2015-05-30 00:17:00 +02:00
Vincent Breitmoser 1406eec2dc make KeyItem serializble, for state in TokenTextCompleteView 2015-05-30 00:16:27 +02:00
Vincent Breitmoser 8be6450a36 preserve state in DecryptFilesActivity/-Fragment 2015-05-29 21:38:20 +02:00
Vincent Breitmoser c9f9af6603 preserve state in CertifyKeyFragment 2015-05-29 21:07:56 +02:00
Vincent Breitmoser dd94c70fbe fix RequiredInputParcel handling in CertifyOperation 2015-05-29 20:26:06 +02:00
Vincent Breitmoser e174b8af3b Merge remote-tracking branch 'origin/master' into development 2015-05-29 11:41:02 +02:00
Vincent Breitmoser 25d0325c5f Merge remote-tracking branch 'origin/development' into development 2015-05-29 11:31:48 +02:00
Vincent Breitmoser 4c1ddd7743 Partially revert "make masterKeyId and subKeyId strictly required in CryptoInputParcel" 
We do need empty masterKeyIds for symmetric passphrases, whoops :)
 2015-05-28 23:14:03 +02:00
Vincent Breitmoser 38d8f4be52 Merge remote-tracking branch 'origin/master' into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-28 23:05:41 +02:00
Vincent Breitmoser 2bbb9b9608 update database to trigger consolidate 2015-05-28 22:43:10 +02:00
Vincent Breitmoser c4d392051c improve robustness of SecretKeyType handling 2015-05-28 22:34:02 +02:00
Vincent Breitmoser c8f788b925 set to stripped by default, rather than "unavailable" 2015-05-28 22:22:24 +02:00
Vincent Breitmoser b2f32827c6 allow user packets with only revocation packet 2015-05-28 22:00:08 +02:00
Vincent Breitmoser 007bbdda2b respect cache in yubikey pin data flow 2015-05-28 19:27:56 +02:00
Vincent Breitmoser 18844a20bb make masterKeyId and subKeyId strictly required in CryptoInputParcel 2015-05-28 19:16:36 +02:00
Vincent Breitmoser 1deb5dbfda preserve state in DecryptTextActivity 2015-05-28 18:55:34 +02:00
Vincent Breitmoser 34c26fe5d1 shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperation 2015-05-28 17:33:42 +02:00
Vincent Breitmoser 1463bae1b4 fix merge problems (derp) 2015-05-28 17:32:21 +02:00
Vincent Breitmoser 40703fe961 Merge branch 'master' into development 
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-28 16:37:15 +02:00
Vincent Breitmoser ee02e110e7 don't keep an activity reference in CreateKeyFinalFragment 2015-05-28 16:35:03 +02:00
Vincent Breitmoser 8de0d9e6da create keys with fixed timestamp 2015-05-28 16:34:41 +02:00
Vincent Breitmoser eb830c6786 warn on signature earlier than key creation, err on significantly earlier 2015-05-28 16:33:45 +02:00
Vincent Breitmoser 5c8af1c5a5 don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes 2015-05-28 16:33:45 +02:00
Vincent Breitmoser 1fb7477a5a correctly preserve state in EncryptTextFragment 2015-05-28 16:33:45 +02:00
Vincent Breitmoser 58583c0819 correctly preserve state in EncryptFilesFragment 2015-05-28 16:33:44 +02:00
Vincent Breitmoser 40ab96539c move synchronous encryption into activity, and preserve checkbox state 2015-05-28 16:33:44 +02:00
Vincent Breitmoser 7c20c8df93 preserve state in KeySpinner, and some lint fixes 2015-05-28 16:33:44 +02:00
Vincent Breitmoser 8f3e0a9110 rewrite EncryptActivity data flow 2015-05-28 16:33:44 +02:00
Vincent Breitmoser e03e1e5cfc fix nullpointer in encrypttextactivity. fixes #1267 2015-05-28 16:33:44 +02:00
Vincent Breitmoser 6e3ed1d2db do nfc dispatching in MainActivity 2015-05-28 16:33:14 +02:00
Vincent Breitmoser 4ecd4389b3 don't keep an activity reference in CreateKeyFinalFragment 2015-05-28 15:02:50 +02:00
Vincent Breitmoser 62e65a8240 create keys with fixed timestamp 2015-05-28 14:41:26 +02:00
Vincent Breitmoser 724726a4fd warn on signature earlier than key creation, err on significantly earlier 2015-05-28 11:40:35 +02:00
Vincent Breitmoser a8e95f676e don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes 2015-05-28 02:27:44 +02:00
Vincent Breitmoser 426d17bd0a correctly preserve state in EncryptTextFragment 2015-05-27 23:03:04 +02:00
Vincent Breitmoser 56a75774d0 correctly preserve state in EncryptFilesFragment 2015-05-27 22:55:36 +02:00
Vincent Breitmoser 8dc9773c1e move synchronous encryption into activity, and preserve checkbox state 2015-05-27 22:33:14 +02:00
Vincent Breitmoser fed0e7db8d preserve state in KeySpinner, and some lint fixes 2015-05-27 22:07:34 +02:00
Vincent Breitmoser 6c17734e73 rewrite EncryptActivity data flow 2015-05-27 21:15:36 +02:00
Vincent Breitmoser 08e0357471 fix nullpointer in encrypttextactivity. fixes #1267 2015-05-27 18:18:34 +02:00
Vincent c4b774f7b8 Merge pull request #1293 from Yoshi64Bit/development 
highlight currently selected item in navigation drawer
 2015-05-23 11:14:20 +02:00
Vincent Breitmoser f30900d085 add user id flags to UserAttribute self signatures 2015-05-20 12:47:23 +02:00
Vincent Breitmoser 4885361cd2 check fingerprint length after scanning qr code 
Fixes #1281
 2015-05-17 10:37:03 +02:00
Vincent Breitmoser b62ad4d79c check fingerprint length after scanning qr code 
Fixes #1281
 2015-05-17 10:36:30 +02:00
Vincent Breitmoser fb96b6dfa9 open ViewKeyActivity by subkey in NfcBaseActivity 2015-05-17 02:14:27 +02:00
Vincent Breitmoser a79d7bd1c2 simplify MainActivity and fix backstack issues 2015-05-17 02:13:51 +02:00
Vincent Breitmoser b430ba51eb do nfc dispatching in MainActivity 2015-05-17 02:09:58 +02:00
Vincent Breitmoser bd8e45b556 open ViewKeyActivity by subkey in NfcBaseActivity 2015-05-17 01:57:26 +02:00
Vincent Breitmoser cd0d84d10d simplify MainActivity and fix backstack issues 2015-05-17 01:46:00 +02:00
Vincent Breitmoser 064c9d461f re-parcel log in LogDisplayFragment 2015-05-17 01:17:01 +02:00
Vincent Breitmoser 3a27a28c0a re-parcel log in LogDisplayFragment 2015-05-17 01:13:41 +02:00
Vincent Breitmoser 765990ed13 fingerprints are 20 bytes, not 40. duh. 2015-05-17 01:04:34 +02:00
Vincent Breitmoser 9a6f581400 load yubikey fragment after mMasterKeyId is available 2015-05-17 01:04:32 +02:00
Vincent Breitmoser 158263f255 apply promote operation to specific subkeys present on yubikey only 2015-05-17 01:04:31 +02:00
Vincent Breitmoser 71818934ca pass masterKeyId to yubikey fragment 2015-05-17 01:04:27 +02:00
Vincent Breitmoser f6643962af allow state loss when yubikey fragment is loaded 2015-05-17 01:04:25 +02:00
Vincent Breitmoser d06ae7f691 yubikey: don't assume signing key is masterKeyId in ViewKeyActivity 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-05-17 01:04:22 +02:00
Vincent Breitmoser b509c3ed39 fix fragment handling in ViewKeyActivity 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-05-17 01:04:19 +02:00
Vincent Breitmoser 7e5e0df0bc fingerprints are 20 bytes, not 40. duh. 2015-05-17 00:59:50 +02:00
Vincent Breitmoser 48f6e20f6c load yubikey fragment after mMasterKeyId is available 2015-05-17 00:54:14 +02:00
Vincent Breitmoser c1e7fcf024 apply promote operation to specific subkeys present on yubikey only 2015-05-17 00:35:10 +02:00
Vincent Breitmoser f554cc9c93 pass masterKeyId to yubikey fragment 2015-05-16 23:59:04 +02:00