aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input
Commit message (Collapse)AuthorAgeFilesLines
* fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-011-12/+35
|
* Prepare decrypt UI for input parcelDominik Schürmann2015-03-311-5/+21
|
* fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-6/+6
|
* further improve yubikey error handlingVincent Breitmoser2015-03-231-0/+4
|
* more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-211-9/+30
| | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
* fix unit tests (for real)Vincent Breitmoser2015-03-201-1/+1
|
* fix unit tests (syntax)Vincent Breitmoser2015-03-201-0/+10
|
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-6/+8
| | | | | | | | | | | | | | | | 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
* support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-202-2/+21
|
* generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-192-30/+73
|
* yubikey certifications!Vincent Breitmoser2015-03-181-15/+66
|
* generalize nfc crypto input structureVincent Breitmoser2015-03-183-52/+166
|
* introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-181-0/+52