Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Guess mime type like support libs FileProvider | Dominik Schürmann | 2015-06-29 | 1 | -7/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -1/+1 |
|\ | |||||
| * | fixed fingerprint mismatch issue | Adithya Abraham Philip | 2015-06-25 | 1 | -1/+1 |
| | | |||||
* | | working DisplayTextActivity, more input support in DecryptActivity | Vincent Breitmoser | 2015-06-20 | 1 | -3/+70 |
| | | |||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 2 | -21/+8 |
|\| | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| * | fix filesize reporting in decrypt operation | Vincent Breitmoser | 2015-06-17 | 1 | -0/+6 |
| | | |||||
| * | fix returned text of cleartext verify | Vincent Breitmoser | 2015-06-17 | 1 | -4/+5 |
| | | |||||
| * | fix recursive log in modifySecretKeyRing | Vincent Breitmoser | 2015-06-17 | 1 | -7/+2 |
| | | |||||
* | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 2 | -9/+1 |
|\| | | | | | | | | | 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 | 2 | -9/+1 |
| | | |||||
* | | multi-decrypt: working in principle | Vincent Breitmoser | 2015-06-02 | 1 | -16/+32 |
| | | |||||
* | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 2 | -28/+33 |
|/ | | | | | | | | 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. | ||||
* | only promote subkeys which are actually present | Vincent Breitmoser | 2015-05-30 | 1 | -8/+5 |
| | |||||
* | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 2 | -126/+237 |
| | |||||
* | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -1/+7 |
| | |||||
* | rewrite data flow in EncryptFileFragment preserve state correctly | Vincent Breitmoser | 2015-05-30 | 1 | -0/+4 |
| | |||||
* | make KeyItem serializble, for state in TokenTextCompleteView | Vincent Breitmoser | 2015-05-30 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 4 | -12/+16 |
|\ | | | | | | | | | | | | | | | 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 | 2 | -8/+10 |
| | | |||||
| * | set to stripped by default, rather than "unavailable" | Vincent Breitmoser | 2015-05-28 | 1 | -3/+3 |
| | | |||||
| * | make masterKeyId and subKeyId strictly required in CryptoInputParcel | Vincent Breitmoser | 2015-05-28 | 2 | -1/+3 |
| | | |||||
| * | 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 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | 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 | 1 | -0/+21 |
| | | |||||
| * | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 1 | -13/+24 |
| | | | | | | | | PgpDecryptVerify changes | ||||
| * | add user id flags to UserAttribute self signatures | Vincent Breitmoser | 2015-05-20 | 1 | -13/+20 |
| | | |||||
| * | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 2 | -3/+21 |
| | | |||||
* | | create keys with fixed timestamp | Vincent Breitmoser | 2015-05-28 | 1 | -5/+7 |
| | | |||||
* | | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+21 |
| | | |||||
* | | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 1 | -13/+24 |
| | | | | | | | | PgpDecryptVerify changes | ||||
* | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 2 | -3/+21 |
| | | |||||
* | | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+36 |
| | | |||||
* | | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 1 | -17/+13 |
| | | |||||
* | | Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵ | Joey Castillo | 2015-05-13 | 1 | -18/+18 |
| | | | | | | | | keytocard; operation unsets it and fills in dummyDivert to finish it. | ||||
* | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 1 | -12/+93 |
| | | |||||
* | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 1 | -0/+24 |
|/ | |||||
* | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 1 | -0/+11 |
| | |||||
* | license header for PgpCertifyOperation | Dominik Schürmann | 2015-05-04 | 1 | -1/+19 |
| | |||||
* | Apply patch from ↵ | Dominik Schürmann | 2015-05-04 | 1 | -2/+9 |
| | | | | https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 | ||||
* | Buffer ascii armored encryption/signatures | Dominik Schürmann | 2015-04-13 | 2 | -3/+4 |
| | |||||
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 4 | -50/+43 |
| | |||||
* | work on passphrase data flow | Vincent Breitmoser | 2015-03-31 | 1 | -10/+34 |
| | |||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -43/+24 |
| | |||||
* | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 3 | -56/+10 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -4/+10 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | Fixed #1152: | Kent | 2015-03-20 | 1 | -5/+11 |
| | | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding. | ||||
* | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 |
| | | |||||
* | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -6/+7 |
| | | |||||
* | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 1 | -2/+4 |
| | |