Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | 1 | -3/+3 | |
| | | ||||||
| * | merged services | Adithya Abraham Philip | 2015-06-01 | 3 | -446/+296 | |
| | | ||||||
* | | multi-decrypt: working in principle | Vincent Breitmoser | 2015-06-02 | 1 | -4/+0 | |
| | | ||||||
* | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 1 | -1/+6 | |
|/ | | | | | | | | 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 | 1 | -4/+2 | |
| | ||||||
* | some decrypt/verify bug fixes | Vincent Breitmoser | 2015-05-30 | 1 | -2/+9 | |
| | ||||||
* | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -160/+24 | |
| | ||||||
* | delete correct cache entries (important for yubikey pins!) | Vincent Breitmoser | 2015-05-30 | 1 | -2/+2 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-29 | 1 | -6/+16 | |
|\ | ||||||
| * | 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 :) | |||||
* | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -22/+14 | |
|\| | | | | | | | | | | | | | | | 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 | |||||
| * | make masterKeyId and subKeyId strictly required in CryptoInputParcel | Vincent Breitmoser | 2015-05-28 | 1 | -24/+14 | |
| | | ||||||
| * | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -3/+5 | |
| | | ||||||
* | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -3/+5 | |
| | | ||||||
* | | Removing unused SubkeyChange constructor. | Joey Castillo | 2015-05-13 | 1 | -12/+0 | |
| | | ||||||
* | | Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵ | Joey Castillo | 2015-05-13 | 1 | -2/+17 | |
| | | | | | | | | keytocard; operation unsets it and fills in dummyDivert to finish it. | |||||
* | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 3 | -28/+45 | |
| | | ||||||
* | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 2 | -1/+26 | |
|/ | ||||||
* | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 1 | -11/+8 | |
| | ||||||
* | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -4/+4 | |
| | ||||||
* | Reformat comment in PassphraseCacheService | Dominik Schürmann | 2015-04-13 | 1 | -4/+5 | |
| | ||||||
* | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 1 | -9/+20 | |
| | ||||||
* | Clearer var naming | Dominik Schürmann | 2015-04-12 | 1 | -8/+8 | |
| | ||||||
* | More simplifications to PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -27/+21 | |
| | ||||||
* | Simplify PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -16/+12 | |
| | ||||||
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 2 | -37/+49 | |
| | ||||||
* | Prepare decrypt UI for input parcel | Dominik Schürmann | 2015-03-31 | 1 | -5/+21 | |
| | ||||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -6/+6 | |
| | ||||||
* | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 1 | -5/+4 | |
| | ||||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 4 | -23/+416 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | Merge pull request #1166 from adithyaphilip/multi-threaded | Dominik Schürmann | 2015-03-23 | 3 | -21/+414 | |
| |\ | | | | | | | Multi-threaded key import, update all feature | |||||
| | * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 3 | -228/+438 | |
| | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | |||||
| | * | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -26/+209 | |
| | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | |||||
| * | | Fix passphrase cache not clearing all passphrases | Dominik Schürmann | 2015-03-23 | 1 | -2/+2 | |
| |/ | ||||||
* | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 2 | -6/+38 | |
| | | ||||||
* | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -2/+3 | |
| | | ||||||
* | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 1 | -2/+2 | |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -2/+2 | |
| | | ||||||
* | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 1 | -9/+30 | |
| | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify() | |||||
* | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+4 | |
| | | ||||||
* | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 2 | -2/+2 | |
| | | ||||||
* | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 2 | -10/+3 | |
| | | ||||||
* | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -0/+10 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 4 | -34/+41 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.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/dialog/SetPassphraseDialogFragment.java | |||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 3 | -29/+34 | |
| | | ||||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 4 | -8/+25 | |
| | | ||||||
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 2 | -30/+73 | |
| | |