| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | Merge branch 'v/sticky-prefs' | Vincent Breitmoser | 2015-06-03 | 6 | -32/+199 |
|\ |
|
| * | keep prefernces individual per dialog (affects only compression) | Vincent Breitmoser | 2015-06-03 | 4 | -10/+22 |
| * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 6 | -32/+187 |
* | | Partially revert "switch to native DialogFragment, fix some nullpointers", bu... | Vincent Breitmoser | 2015-06-03 | 2 | -3/+6 |
* | | 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 | 27 | -197/+195 |
* | | merged services | Adithya Abraham Philip | 2015-06-01 | 25 | -581/+396 |
* | | Merge pull request #1317 from adithyaphilip/master | Dominik Schürmann | 2015-06-01 | 2 | -12/+12 |
|\ \ |
|
| * | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 2 | -12/+12 |
| |/ |
|
* | | 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 | 1 | -3/+7 |
* | 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 | 2 | -1/+8 |
* | 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 | 1 | -0/+33 |
* | 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 |
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-29 | 2 | -7/+19 |
|\ |
|
| * | Partially revert "make masterKeyId and subKeyId strictly required in CryptoIn... | Vincent Breitmoser | 2015-05-28 | 1 | -6/+16 |
| * | update database to trigger consolidate | Vincent Breitmoser | 2015-05-28 | 1 | -1/+3 |
* | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 13 | -78/+121 |
|\| |
|
| * | 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 | 4 | -25/+55 |
| * | 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 | 1 | -4/+2 |
* | | Merge branch 'master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -13/+20 |
|\| |
|
| * | don't keep an activity reference in CreateKeyFinalFragment | Vincent Breitmoser | 2015-05-28 | 1 | -25/+19 |
| * | create keys with fixed timestamp | Vincent Breitmoser | 2015-05-28 | 1 | -6/+8 |
| * | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 2 | -0/+22 |
| * | don't show allowed key list if no key exists, and some minor PgpDecryptVerify... | Vincent Breitmoser | 2015-05-28 | 4 | -27/+42 |
| * | 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 | 5 | -22/+48 |