aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)AuthorAgeFilesLines
* Change PIN and Admin PIN after move to key operationDominik Schürmann2015-07-022-27/+64
|
* Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-302-7/+12
|\
| * make timeout method in PassphraseCacheService more robust against nullpointersVincent Breitmoser2015-06-301-4/+9
| |
| * Create key wizard for blank YubiKeyDominik Schürmann2015-06-291-3/+3
| |
* | split import and export opsAdithya Abraham Philip2015-06-274-45/+10
| |
* | renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-271-2/+2
| |
* | removed debug logs, added licensesAdithya Abraham Philip2015-06-277-7/+126
| |
* | fixed Certify opAdithya Abraham Philip2015-06-271-2/+2
| |
* | deleted KeychainServiceAdithya Abraham Philip2015-06-272-184/+7
| |
* | migrated Keybase verificationAdithya Abraham Philip2015-06-273-181/+50
| |
* | migrated consolidationAdithya Abraham Philip2015-06-273-19/+43
| |
* | migrated promote op to KeychainNewServiceAdithya Abraham Philip2015-06-273-29/+51
| |
* | migrated delete op to KeychainNewServiceAdithya Abraham Philip2015-06-273-25/+50
| |
* | migrated key creation to KeychainNewServiceAdithya Abraham Philip2015-06-271-21/+0
| |
* | added export and upload to KeychainNewServiceAdithya Abraham Philip2015-06-275-91/+102
| |
* | introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-274-273/+113
|/
* Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-261-50/+64
|\
| * fix warnings in PassphraseCacheServiceVincent Breitmoser2015-06-261-13/+25
| |
| * Notification: follow design guidelines, fix #1313Dominik Schürmann2015-06-241-48/+31
| |
| * New notify iconDominik Schürmann2015-06-241-1/+1
| |
| * New all-white status bar icon to fix issue #1356moparisthebest2015-06-221-2/+21
| |
* | small fix and some cleanup in ServiceProgressFragmentVincent Breitmoser2015-06-221-12/+32
| |
* | minor code style fixesVincent Breitmoser2015-06-181-1/+3
| |
* | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-171-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 cacheVincent Breitmoser2015-06-171-0/+8
| |
* | fix progress for decryptVincent Breitmoser2015-06-101-7/+23
| |
* | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-104-99/+108
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
| * backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-104-99/+108
| |
* | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-074-88/+169
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
| * eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-064-88/+169
| |
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-064-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 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
| |
* | multi-decrypt: working in principleVincent Breitmoser2015-06-021-4/+0
| |
* | introduce CachingDataDecryptorFactory towards cached session keysVincent Breitmoser2015-06-011-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 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 14:27:15 +0000