Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 15 | -148/+152 | |
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | |||||
| * | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 14 | -140/+124 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-10 | 2 | -4/+28 | |
| |\| | ||||||
| | * | select correct item in drawer on backstack change in main activity | Vincent Breitmoser | 2015-06-08 | 1 | -1/+25 | |
| | | | ||||||
| | * | prevent null fragments on activity death | Adithya Abraham Philip | 2015-06-03 | 1 | -3/+3 | |
| | | | ||||||
* | | | multi-decrypt: fix progress with new CryptoFragment interfaces | Vincent Breitmoser | 2015-06-07 | 2 | -139/+73 | |
| | | | ||||||
* | | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 8 | -453/+312 | |
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java | |||||
| * | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 9 | -563/+330 | |
| |/ | ||||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 24 | -320/+407 | |
|\| | | | | | | | | | | | | | | | | | 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 | |||||
| * | Merge branch 'v/sticky-prefs' | Vincent Breitmoser | 2015-06-03 | 4 | -32/+153 | |
| |\ | ||||||
| | * | keep prefernces individual per dialog (affects only compression) | Vincent Breitmoser | 2015-06-03 | 2 | -5/+4 | |
| | | | ||||||
| | * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 4 | -32/+154 | |
| | | | ||||||
| * | | Partially revert "switch to native DialogFragment, fix some nullpointers", ↵ | Vincent Breitmoser | 2015-06-03 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | but keep nullpointer fixes This reverts commit 403f74f55830dcc5eaa027ccebb888a1122992d1. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java | |||||
| * | | hide invoke nfc button in android < 5 | Vincent Breitmoser | 2015-06-03 | 1 | -6/+11 | |
| | | | ||||||
| * | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 21 | -170/+168 | |
| | | | ||||||
| * | | merged services | Adithya Abraham Philip | 2015-06-01 | 20 | -129/+87 | |
| | | | ||||||
* | | | multi-decrypt: implement save operation (missing actual copy) | Vincent Breitmoser | 2015-06-03 | 1 | -50/+76 | |
| | | | ||||||
* | | | multi-decrypt: working context menu | Vincent Breitmoser | 2015-06-03 | 1 | -5/+69 | |
| | | | ||||||
* | | | get back to a working state | Vincent Breitmoser | 2015-06-03 | 1 | -3/+5 | |
| | | | ||||||
* | | | multi-decrypt: working in principle | Vincent Breitmoser | 2015-06-02 | 2 | -34/+343 | |
| | | | ||||||
* | | | multi-decrypt: working recyclerview which decrypt files sequentially, ui in ↵ | Vincent Breitmoser | 2015-06-02 | 3 | -243/+212 | |
| | | | | | | | | | | | | progress | |||||
* | | | multi-decrypt: first steps, split up DecryptFilesFragment | Vincent Breitmoser | 2015-06-01 | 3 | -118/+435 | |
| | | | ||||||
* | | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 1 | -12/+17 | |
|/ / | | | | | | | | | | | | | | | 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. | |||||
* | | switch to native DialogFragment, fix some nullpointers | Vincent Breitmoser | 2015-05-31 | 1 | -18/+24 | |
| | | ||||||
* | | revert some accidentally committed cruft | Vincent Breitmoser | 2015-05-31 | 1 | -8/+0 | |
| | | ||||||
* | | handle empty passphrases in PassphraseDialogActivity | Vincent Breitmoser | 2015-05-31 | 2 | -0/+34 | |
|/ | ||||||
* | prevent NaN dialog on import with no selected keys | Adithya Abraham Philip | 2015-05-31 | 1 | -3/+7 | |
| | ||||||
* | some decrypt/verify bug fixes | Vincent Breitmoser | 2015-05-30 | 1 | -2/+1 | |
| | ||||||
* | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 4 | -16/+12 | |
| | ||||||
* | show status indicators in EncryptFragment | Vincent Breitmoser | 2015-05-30 | 1 | -0/+33 | |
| | ||||||
* | rewrite data flow in EncryptFileFragment preserve state correctly | Vincent Breitmoser | 2015-05-30 | 3 | -66/+87 | |
| | ||||||
* | externalize caching functionality from CertifyKeyFragment | Vincent Breitmoser | 2015-05-30 | 2 | -20/+75 | |
| | ||||||
* | make KeyItem serializble, for state in TokenTextCompleteView | Vincent Breitmoser | 2015-05-30 | 1 | -1/+3 | |
| | ||||||
* | preserve state in DecryptFilesActivity/-Fragment | Vincent Breitmoser | 2015-05-29 | 2 | -37/+26 | |
| | ||||||
* | preserve state in CertifyKeyFragment | Vincent Breitmoser | 2015-05-29 | 2 | -30/+73 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 7 | -38/+85 | |
|\ | | | | | | | | | | | | | | | 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 | |||||
| * | respect cache in yubikey pin data flow | Vincent Breitmoser | 2015-05-28 | 2 | -6/+21 | |
| | | ||||||
| * | preserve state in DecryptTextActivity | Vincent Breitmoser | 2015-05-28 | 4 | -25/+55 | |
| | | ||||||
| * | shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperation | Vincent Breitmoser | 2015-05-28 | 1 | -7/+8 | |
| | | ||||||
| * | don't keep an activity reference in CreateKeyFinalFragment | Vincent Breitmoser | 2015-05-28 | 1 | -25/+19 | |
| | | ||||||
| * | correctly preserve state in EncryptTextFragment | Vincent Breitmoser | 2015-05-28 | 1 | -3/+15 | |
| | | ||||||
| * | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-28 | 2 | -7/+38 | |
| | | ||||||
| * | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-28 | 3 | -15/+33 | |
| | | ||||||
| * | preserve state in KeySpinner, and some lint fixes | Vincent Breitmoser | 2015-05-28 | 4 | -20/+46 | |
| | | ||||||
| * | rewrite EncryptActivity data flow | Vincent Breitmoser | 2015-05-28 | 10 | -477/+346 | |
| | | ||||||
| * | fix nullpointer in encrypttextactivity. fixes #1267 | Vincent Breitmoser | 2015-05-28 | 1 | -24/+18 | |
| | | ||||||
| * | highlight currently selected item in navigation drawer | Yoshi64Bit | 2015-05-28 | 1 | -10/+19 | |
| | | ||||||
| * | AssertionError instead of RuntimeException | Dominik Schürmann | 2015-05-28 | 1 | -1/+1 | |
| | | ||||||
| * | Change convertFingerprintToHex to use RuntimeException | Dominik Schürmann | 2015-05-28 | 1 | -7/+4 | |
| | | ||||||
| * | Improve strings | Dominik Schürmann | 2015-05-28 | 2 | -6/+3 | |
| | |