Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 7 | -32/+195 |
| | |||||
* | 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 |
| | |||||
* | 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 |
|\ | |||||
| * | 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 |
| | | |||||
* | | Merge branch 'master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -13/+20 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | 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 | 3 | -0/+23 |
| | | |||||
| * | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 12 | -35/+50 |
| | | | | | | | | PgpDecryptVerify changes | ||||
| * | correctly preserve state in EncryptTextFragment | Vincent Breitmoser | 2015-05-28 | 1 | -3/+15 |
| | | |||||
| * | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-28 | 3 | -9/+38 |
| | | |||||
| * | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-28 | 6 | -25/+42 |
| | | |||||
| * | preserve state in KeySpinner, and some lint fixes | Vincent Breitmoser | 2015-05-28 | 5 | -22/+48 |
| | | |||||
| * | 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 | 4 | -34/+48 |
| | | |||||
| * | do nfc dispatching in MainActivity | Vincent Breitmoser | 2015-05-28 | 4 | -9/+15 |
| | | |||||
| * | Version 3.2.2 | Dominik Schürmann | 2015-05-21 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-05-21 | 1 | -13/+20 |
| |\ | |||||
| | * | add user id flags to UserAttribute self signatures | Vincent Breitmoser | 2015-05-20 | 1 | -13/+20 |
| | | | |||||
| * | | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 3 | -3/+3 |
| |/ | |||||
| * | Fix fingerprint length check in QR Code import | Dominik Schürmann | 2015-05-19 | 1 | -1/+1 |
| | |