| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Add missing WorkaroundBuildConfig | Dominik Schürmann | 2015-06-11 | 1 | -0/+14 | |
| | | | | ||||||
| | * | | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 15 | -17/+30 | |
| | | | | ||||||
| | * | | Use new officially supported way for local unit tests, many dependencies ↵ | Dominik Schürmann | 2015-06-11 | 125 | -0/+5934 | |
| | | | | | | | | | | | | | upgraded for this, temporary disabled separate debug builds | |||||
| | * | | Temporary fix for testDebug | Dominik Schürmann | 2015-06-10 | 1 | -4/+2 | |
| | | | | ||||||
| | * | | Use authority res strings | Dominik Schürmann | 2015-06-10 | 1 | -5/+2 | |
| | | | | ||||||
| | * | | Allow debug build besides release build | Dominik Schürmann | 2015-06-10 | 12 | -15/+17 | |
| | | | | ||||||
| * | | | multi-decrypt: switch to cardview | Vincent Breitmoser | 2015-06-10 | 1 | -9/+15 | |
| | | | | ||||||
| * | | | fix progress for decrypt | Vincent Breitmoser | 2015-06-10 | 3 | -14/+37 | |
| | | | | ||||||
| * | | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 21 | -253/+269 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | |||||
| | * | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 19 | -244/+237 | |
| | | | | ||||||
| | * | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-10 | 3 | -5/+32 | |
| | |\| | ||||||
| | | * | Improve FAQ entry for file manager | Dominik Schürmann | 2015-06-08 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Improve FAQ entry for file manager | Dominik Schürmann | 2015-06-08 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Explicit mention of dependency on 3rd party tool | Stéphane Lavergne | 2015-06-08 | 1 | -1/+4 | |
| | | | | | | | | | | I had the darnest time remembering my old APG days where something was said in passing about, unlike any other application I know, the need here for OI File Manager (or others, later on) to be able to select local files. I'm sure I'm not the only person who could benefit from this reminder. :) | |||||
| | | * | 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 | 20 | -557/+499 | |
| |\| | | | | | | | | | | | | | | 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 | 21 | -667/+517 | |
| | |/ | ||||||
| * | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 38 | -1377/+1390 | |
| |\| | | | | | | | | | | | | | | | | | 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 | 7 | -32/+207 | |
| | |\ | ||||||
| | | * | keep prefernces individual per dialog (affects only compression) | Vincent Breitmoser | 2015-06-03 | 4 | -10/+22 | |
| | | | | ||||||
| | | * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 7 | -32/+195 | |
| | | | | ||||||
| | * | | Partially revert "switch to native DialogFragment, fix some nullpointers", ↵ | Vincent Breitmoser | 2015-06-03 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | ||||||
| | * | | Fix comments in service | Dominik Schürmann | 2015-06-01 | 1 | -8/+8 | |
| | | | | ||||||
| | * | | corrected indentation | Adithya Abraham Philip | 2015-06-01 | 1 | -271/+278 | |
| | | | | ||||||
| | * | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 28 | -198/+196 | |
| | | | | ||||||
| | * | | merged services | Adithya Abraham Philip | 2015-06-01 | 25 | -581/+396 | |
| | | | | ||||||
| | * | | Merge pull request #1317 from adithyaphilip/master | Dominik Schürmann | 2015-06-01 | 3 | -12/+13 | |
| | |\ \ | | | | | | | | | Merge key from Keyserver with that from Keybase instead of replacing | |||||
| | | * | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 3 | -12/+13 | |
| | | |/ | ||||||
| * | | | multi-decrypt: implement save operation (missing actual copy) | Vincent Breitmoser | 2015-06-03 | 3 | -53/+86 | |
| | | | | ||||||
| * | | | multi-decrypt: working context menu | Vincent Breitmoser | 2015-06-03 | 4 | -5/+93 | |
| | | | | ||||||
| * | | | get back to a working state | Vincent Breitmoser | 2015-06-03 | 1 | -3/+5 | |
| | | | | ||||||
| * | | | multi-decrypt: working in principle | Vincent Breitmoser | 2015-06-02 | 5 | -69/+392 | |
| | | | | ||||||
| * | | | multi-decrypt: working recyclerview which decrypt files sequentially, ui in ↵ | Vincent Breitmoser | 2015-06-02 | 5 | -243/+445 | |
| | | | | | | | | | | | | | progress | |||||
| * | | | multi-decrypt: first steps, split up DecryptFilesFragment | Vincent Breitmoser | 2015-06-01 | 5 | -247/+549 | |
| | | | | ||||||
| * | | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 8 | -319/+145 | |
| |/ / | | | | | | | | | | | | | | | 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 | 2 | -22/+26 | |
| | | | ||||||
| * | | 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 | 2 | -3/+8 | |
| | | ||||||
| * | only promote subkeys which are actually present | Vincent Breitmoser | 2015-05-30 | 1 | -8/+5 | |
| | | ||||||
| * | some decrypt/verify bug fixes | Vincent Breitmoser | 2015-05-30 | 3 | -5/+12 | |
| | | ||||||
| * | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 10 | -342/+323 | |
| | | ||||||
| * | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 3 | -1/+9 | |
| | | ||||||
| * | delete correct cache entries (important for yubikey pins!) | Vincent Breitmoser | 2015-05-30 | 1 | -2/+2 | |
| | | ||||||
| * | show status indicators in EncryptFragment | Vincent Breitmoser | 2015-05-30 | 4 | -17/+129 | |
| | | ||||||
| * | rewrite data flow in EncryptFileFragment preserve state correctly | Vincent Breitmoser | 2015-05-30 | 4 | -66/+91 | |
| | | ||||||
| * | externalize caching functionality from CertifyKeyFragment | Vincent Breitmoser | 2015-05-30 | 2 | -20/+75 | |
| | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |