aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)AuthorAgeFilesLines
* apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-3/+5
|
* Removing unused SubkeyChange constructor.Joey Castillo2015-05-131-12/+0
|
* Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵Joey Castillo2015-05-131-2/+17
| | | | keytocard; operation unsets it and fills in dummyDivert to finish it.
* Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-133-28/+45
|
* Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-122-1/+26
|
* Fix import of keyring with pub+sec key with same key idDominik Schürmann2015-05-061-11/+8
|
* Fix YubiKey naming, cleanupDominik Schürmann2015-04-151-4/+4
|
* Reformat comment in PassphraseCacheServiceDominik Schürmann2015-04-131-4/+5
|
* IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-131-9/+20
|
* Clearer var namingDominik Schürmann2015-04-121-8/+8
|
* More simplifications to PassphraseCacheServiceDominik Schürmann2015-04-121-27/+21
|
* Simplify PassphraseCacheServiceDominik Schürmann2015-04-121-16/+12
|
* fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-012-37/+49
|
* Prepare decrypt UI for input parcelDominik Schürmann2015-03-311-5/+21
|
* fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-6/+6
|
* pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-301-5/+4
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-244-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-threadedDominik Schürmann2015-03-233-21/+414
| |\ | | | | | | Multi-threaded key import, update all feature
| | * shifted multi-threading to own serviceAdithya Abraham Philip2015-03-233-228/+438
| | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| | * introduced multi-threadingAdithya Abraham Philip2015-03-231-26/+209
| | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
| * | Fix passphrase cache not clearing all passphrasesDominik Schürmann2015-03-231-2/+2
| |/
* | further improve yubikey error handlingVincent Breitmoser2015-03-232-6/+38
| |
* | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-2/+3
| |
* | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-1/+1
| |
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-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 classManoj Khanna2015-03-201-2/+2
| |
* | 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()
* | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+4
| |
* | fix unit tests (for real)Vincent Breitmoser2015-03-202-2/+2
| |
* | fix more unit tests (syntax)Vincent Breitmoser2015-03-202-10/+3
| |
* | fix unit tests (syntax)Vincent Breitmoser2015-03-201-0/+10
| |
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-204-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 memoryDominik Schürmann2015-03-193-29/+34
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-204-8/+25
| |
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-192-30/+73
| |
* | yubikey certifications!Vincent Breitmoser2015-03-183-17/+80
| |
* | generalize nfc crypto input structureVincent Breitmoser2015-03-184-59/+172
| |
* | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-182-2/+61
|/
* Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-112-2/+2
|
* Added braces to if else.danielnelz2015-03-092-4/+6
|
* Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-092-48/+78
| | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* add support for certification of user attributesVincent Breitmoser2015-03-081-3/+11
|
* show refresh key progress inlineVincent Breitmoser2015-02-271-1/+6
|
* Merge keybase-proof branchDominik Schürmann2015-02-272-9/+151
|\
| * Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-051-1/+1
| |\
| * | Add check that proof & database fingerprints are the sameTim Bray2014-11-211-3/+6
| | |
| * | Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-221-0/+1
| | |
| * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-15/+10
| |\ \
| * | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵Tim Bray2014-11-191-1/+7
| | | | | | | | | | | | | | | | gracefully. Fixes #1007 & #1008.
| * | | All keybase proofs now in placeTim Bray2014-11-112-5/+38
| | | |