| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | | | | | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 28 | -198/+196 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | merged services | Adithya Abraham Philip | 2015-06-01 | 25 | -581/+396 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Better use HEAD instead of master to link to files | Dominik Schürmann | 2015-06-01 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | 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 | |
| | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Fix links to branch | Dominik Schürmann | 2015-06-01 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | update spongycastle with branch-specific patch stack | Vincent Breitmoser | 2015-06-03 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | | | | | | | | | | | | check for cached session keys in some tests | Vincent Breitmoser | 2015-06-01 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix small non-deterministic failure case in unit test | Vincent Breitmoser | 2015-05-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | 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 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #1318 from adithyaphilip/remove-nan | Vincent | 2015-05-30 | 2 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent NaN Progress Dialog on import with no selected keys | |||||
| | * | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | adapt unit tests to PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -78/+101 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | make KeyItem serializble, for state in TokenTextCompleteView | Vincent Breitmoser | 2015-05-30 | 2 | -2/+5 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | fix RequiredInputParcel handling in CertifyOperation | Vincent Breitmoser | 2015-05-29 | 1 | -6/+25 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | branch info | Dominik Schürmann | 2015-05-29 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-29 | 2 | -7/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Version 3.2.3 | Dominik Schürmann | 2015-05-29 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Partially revert "make masterKeyId and subKeyId strictly required in ↵ | Vincent Breitmoser | 2015-05-28 | 1 | -6/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CryptoInputParcel" We do need empty masterKeyIds for symmetric passphrases, whoops :) | |||||
| | * | | | | | | | | | | | | | | | update database to trigger consolidate | Vincent Breitmoser | 2015-05-28 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-05-29 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Version 3.2.3 | Dominik Schürmann | 2015-05-29 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 14 | -80/+122 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | | | | | improve robustness of SecretKeyType handling | Vincent Breitmoser | 2015-05-28 | 3 | -9/+11 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | set to stripped by default, rather than "unavailable" | Vincent Breitmoser | 2015-05-28 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | allow user packets with only revocation packet | Vincent Breitmoser | 2015-05-28 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | respect cache in yubikey pin data flow | Vincent Breitmoser | 2015-05-28 | 2 | -6/+21 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | make masterKeyId and subKeyId strictly required in CryptoInputParcel | Vincent Breitmoser | 2015-05-28 | 3 | -25/+17 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | preserve state in DecryptTextActivity | Vincent Breitmoser | 2015-05-28 | 5 | -27/+56 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperation | Vincent Breitmoser | 2015-05-28 | 1 | -7/+8 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix merge problems (derp) | Vincent Breitmoser | 2015-05-28 | 2 | -20/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |