| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 4 | -273/+113 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -50/+64 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | fix warnings in PassphraseCacheService | Vincent Breitmoser | 2015-06-26 | 1 | -13/+25 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Notification: follow design guidelines, fix #1313 | Dominik Schürmann | 2015-06-24 | 1 | -48/+31 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | New notify icon | Dominik Schürmann | 2015-06-24 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | New all-white status bar icon to fix issue #1356 | moparisthebest | 2015-06-22 | 1 | -2/+21 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | small fix and some cleanup in ServiceProgressFragment | Vincent Breitmoser | 2015-06-22 | 1 | -12/+32 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | minor code style fixes | Vincent Breitmoser | 2015-06-18 | 1 | -1/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -0/+8 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |||||
| | * | | | | | | | | | instrument: use contrib drawer methods, respect passphrase cache | Vincent Breitmoser | 2015-06-17 | 1 | -0/+8 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | fix progress for decrypt | Vincent Breitmoser | 2015-06-10 | 1 | -7/+23 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 4 | -99/+108 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | |||||
| | * | | | | | | | | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 4 | -99/+108 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 4 | -88/+169 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -88/+169 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 4 | -1014/+877 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | | | | | | | | | Partially revert "switch to native DialogFragment, fix some nullpointers", ↵ | Vincent Breitmoser | 2015-06-03 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but keep nullpointer fixes This reverts commit 403f74f55830dcc5eaa027ccebb888a1122992d1. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java | |||||
| | * | | | | | | | | | 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 | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |