aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)AuthorAgeFilesLines
* instrument: use contrib drawer methods, respect passphrase cacheVincent Breitmoser2015-06-171-0/+8
|
* backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-104-99/+108
|
* eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-064-88/+169
|
* Partially revert "switch to native DialogFragment, fix some nullpointers", ↵Vincent Breitmoser2015-06-031-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 serviceDominik Schürmann2015-06-011-8/+8
|
* corrected indentationAdithya Abraham Philip2015-06-011-271/+278
|
* renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-011-3/+3
|
* merged servicesAdithya Abraham Philip2015-06-013-446/+296
|
* switch to native DialogFragment, fix some nullpointersVincent Breitmoser2015-05-311-4/+2
|
* some decrypt/verify bug fixesVincent Breitmoser2015-05-301-2/+9
|
* rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-301-160/+24
|
* delete correct cache entries (important for yubikey pins!)Vincent Breitmoser2015-05-301-2/+2
|
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-291-6/+16
|\
| * Partially revert "make masterKeyId and subKeyId strictly required in ↵Vincent Breitmoser2015-05-281-6/+16
| | | | | | | | | | | | CryptoInputParcel" We do need empty masterKeyIds for symmetric passphrases, whoops :)
* | Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-281-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 CryptoInputParcelVincent Breitmoser2015-05-281-24/+14
| |
| * apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-3/+5
| |
* | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 14:18:55 +0000