Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 3 | -17/+80 |
| | | |||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 4 | -59/+172 |
| | | |||||
* | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 2 | -2/+61 |
|/ | |||||
* | Fixed possible ArrayIndexOutOfBoundsException. | danielnelz | 2015-03-11 | 2 | -2/+2 |
| | |||||
* | Added braces to if else. | danielnelz | 2015-03-09 | 2 | -4/+6 |
| | |||||
* | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 2 | -48/+78 |
| | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
* | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -3/+11 |
| | |||||
* | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 1 | -1/+6 |
| | |||||
* | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 2 | -9/+151 |
|\ | |||||
| * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 |
| |\ | |||||
| * | | Add check that proof & database fingerprints are the same | Tim Bray | 2014-11-21 | 1 | -3/+6 |
| | | | |||||
| * | | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 1 | -15/+10 |
| |\ \ | |||||
| * | | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵ | Tim Bray | 2014-11-19 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | gracefully. Fixes #1007 & #1008. | ||||
| * | | | All keybase proofs now in place | Tim Bray | 2014-11-11 | 2 | -5/+38 |
| | | | | |||||
| * | | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -20/+113 |
| | | | | |||||
* | | | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 5 | -154/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | | | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -0/+1 |
| | | | | |||||
* | | | | Fix cleartext signatures internally | Dominik Schürmann | 2015-01-27 | 1 | -5/+4 |
| | | | | |||||
* | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 1 | -38/+17 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java |