aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
Commit message (Collapse)AuthorAgeFilesLines
* Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-134-145/+4
|
* Moved checks from fragment to operation, impoved logging.Joey Castillo2015-05-123-18/+60
|
* Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-122-0/+107
|
* fixed sync on key import, 'me' linked contact crashAdithya Abraham Philip2015-05-081-0/+2
|
* check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-061-6/+7
|
* Externalize Parcelable cachingDominik Schürmann2015-04-101-59/+11
|
* Fix signing subkey selection in remote serviceDominik Schürmann2015-04-071-0/+1
|
* fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-012-53/+7
|
* fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-305-76/+50
|
* pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-302-4/+3
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-2/+5
|\
| * changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| |
* | Fixing crashes with new encrypt uiDominik Schürmann2015-03-291-2/+18
| |
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-9/+11
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * introduced multi-threadingAdithya Abraham Philip2015-03-231-9/+11
| | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
* | finish ui flow for yubikey importVincent Breitmoser2015-03-221-1/+1
| |
* | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-222-14/+2
| |
* | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-211-1/+1
| |
* | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-2/+7
| |
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-214-5/+5
|\| | | | | | | | | | | 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-204-16/+16
| |
* | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-213-11/+26
| | | | | | | | | | - 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/+1
| |
* | fix unit tests (for real)Vincent Breitmoser2015-03-201-1/+3
| |
* | fix more unit tests (syntax)Vincent Breitmoser2015-03-201-5/+6
| |
* | fix unit tests (syntax)Vincent Breitmoser2015-03-201-2/+2
| |
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-205-12/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-195-12/+18
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-205-40/+22
| |
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-194-16/+15
| |
* | yubikey certifications!Vincent Breitmoser2015-03-185-26/+107
| |
* | generalize nfc crypto input structureVincent Breitmoser2015-03-182-14/+4
|/
* Add missing license headersDominik Schürmann2015-03-156-0/+102
|
* Fix for Issue #1115Manoj Khanna2015-03-131-1/+2
|
* added contact sync at end of CertifyOperationAdithya Abraham Philip2015-03-111-0/+4
|
* add support for certification of user attributesVincent Breitmoser2015-03-082-10/+18
|
* Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
|
* Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-051-8/+0
| | | | activites, select hash and encryption algo based on hardcoded preferred lists
* Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-041-0/+7
|\ | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
| |
* | Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant.
* | Fix root cause of #1077Morgan Gangwere2015-03-031-6/+70
|/ | | | | | | | | | | | | | | | | When importing lots of keys, lots of messages about the status of keys is generated, including some debug slime and general fluff that isn't really needed a lot of the time. As a result, a serious bug can come along after key imports or certain operations which cause a log to become parceled. This commit implements a pool to "dehydrate" logs into: they are placed into the pool (a ConcurrentHashMap) and a UUID assigned to them, which is parceled along. When the OperationResult is un-parceled, it reads in the appropriate UUID bits and rehydrates the appropriate log. In order to avoid any memory leaks, the log pool removes a reference to the log itself, allowing the log to die a natural death at the hands of the GC..
* Merge keybase-proof branchDominik Schürmann2015-02-271-0/+9
|\
| * Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+9
| |
* | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-0/+1
| |
* | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-0110-131/+346
| | | | | | | | | | | | | | - 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 consolidateVincent Breitmoser2015-01-311-0/+1
| |
* | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-295-198/+96
|\ \ | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * | use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-195-198/+96
| | |
* | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-274-3/+62
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java