cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,738 Commits 1 Branch 0 Tags
dbaf7070ead596f5c70ad48fc55aada2f77a856a
Commit Graph
4738 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 0505af7520 select correct item in drawer on backstack change in main activity 2015-06-08 16:18:16 +02:00
Dominik Schürmann 69c8ecd553 Merge pull request #1327 from adithyaphilip/fix-null 
Prevent NullPointerException due to Activity death
 2015-06-08 09:55:13 +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
Adithya Abraham Philip 82f3d70224 prevent null fragments on activity death 2015-06-03 19:01:01 +05:30
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
Dominik Schürmann e2988c2a68 Fix comments in service 2015-06-01 15:52:07 +02:00
Dominik Schürmann 7d29901f64 Merge pull request #1320 from adithyaphilip/merge-services-new 
Merged CloudImportService and KeychainIntentService into KeychainService
 2015-06-01 15:50:09 +02:00
Adithya Abraham Philip ebba24cbd8 corrected indentation 2015-06-01 17:44:44 +05:30
Adithya Abraham Philip 6bc40d12ad renamed KeychainIntentService to KeychainService 2015-06-01 17:43:00 +05:30
Adithya Abraham Philip 14a08361e5 merged services 2015-06-01 17:41:44 +05:30
Vincent Breitmoser 04d6fd62c8 check for cached session keys in some tests 2015-06-01 12:02:05 +02:00
Dominik Schürmann b356df900f Better use HEAD instead of master to link to files 2015-06-01 10:26:30 +02:00
Dominik Schürmann af5fc66229 Merge pull request #1317 from adithyaphilip/master 
Merge key from Keyserver with that from Keybase instead of replacing
 2015-06-01 10:15:46 +02:00
Dominik Schürmann 784dbc087e Fix links to branch 2015-06-01 09:43:56 +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
Adithya Abraham Philip 93f3a98eae prevent keybase key replacing keyserver key 2015-05-31 02:49:11 +05:30
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
Adithya Abraham Philip cfeffef80d prevent NaN dialog on import with no selected keys 2015-05-31 02:36:45 +05:30
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
Dominik Schürmann 213798dde1 branch info 2015-05-29 12:19:30 +02:00