aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-3022-351/+678
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-06-301-4/+9
| |\
| | * make timeout method in PassphraseCacheService more robust against nullpointersVincent Breitmoser2015-06-301-4/+9
| * | Better settings workaroundsDominik Schürmann2015-06-302-3/+131
| |/
| * Cleanup preference codeDominik Schürmann2015-06-301-41/+3
| * instrument: add test for empty clipboard, fix empty clipboard errorVincent Breitmoser2015-06-301-2/+4
| * earlier error on empty clipboardVincent Breitmoser2015-06-301-3/+19
| * fail more gracefully on empty clipboard in DecryptActivityVincent Breitmoser2015-06-301-0/+7
| * Revert "Disable YubiKey key creation for release"Dominik Schürmann2015-06-301-14/+5
| * Disable YubiKey key creation for releaseDominik Schürmann2015-06-301-5/+14
| * Use proper length and mod time for cleartext signature metadataDominik Schürmann2015-06-291-2/+2
| * Return metadata for cleartext sigsDominik Schürmann2015-06-291-0/+7
| * Connect YubiKey URL to OpenKeychainDominik Schürmann2015-06-292-6/+26
| * Create key wizard for blank YubiKeyDominik Schürmann2015-06-2910-54/+206
| * instrument: add tests for adv key share fragmentVincent Breitmoser2015-06-291-2/+6
| * cleanup share fragment, fix sharing of fingerprintVincent Breitmoser2015-06-292-166/+120
| * Force db upgrade on app startDominik Schürmann2015-06-291-2/+9
| * Use signature-level signature for TemporaryStorageProvider and describe the s...Dominik Schürmann2015-06-291-15/+46
| * Add brackets in KeychainProviderDominik Schürmann2015-06-291-30/+43
| * Use application/octet-stream as default type in TemporaryStorageProviderDominik Schürmann2015-06-291-1/+1
| * Guess mime type like support libs FileProviderDominik Schürmann2015-06-291-7/+1
* | made CryptoOperationFragment implement OperationHelper.CallbackAdithya Abraham Philip2015-06-3011-59/+33
* | changed to work with multi-decryptAdithya Abraham Philip2015-06-2716-228/+99
* | split import and export opsAdithya Abraham Philip2015-06-279-394/+395
* | fixed package importAdithya Abraham Philip2015-06-272-3/+2
* | renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-274-12/+12
* | removed debug logs, added licensesAdithya Abraham Philip2015-06-2713-19/+191
* | fixed Certify opAdithya Abraham Philip2015-06-273-4/+4
* | deleted KeychainServiceAdithya Abraham Philip2015-06-2718-259/+236
* | migrated Keybase verificationAdithya Abraham Philip2015-06-278-285/+394
* | migrated consolidationAdithya Abraham Philip2015-06-276-115/+142
* | fixed promote key testsAdithya Abraham Philip2015-06-271-0/+5
* | migrated promote op to KeychainNewServiceAdithya Abraham Philip2015-06-275-70/+80
* | migrated delete op to KeychainNewServiceAdithya Abraham Philip2015-06-276-70/+131
* | migrated key creation to KeychainNewServiceAdithya Abraham Philip2015-06-273-92/+52
* | added export and upload to KeychainNewServiceAdithya Abraham Philip2015-06-279-225/+263
* | allow progress message to be set laterAdithya Abraham Philip2015-06-273-47/+17
* | made EmailKeyHelper work with CryptoOperationHelperAdithya Abraham Philip2015-06-271-24/+29
* | migrated import to KeychainNewServiceAdithya Abraham Philip2015-06-275-248/+218
* | introduced OpHelper for import in DecryptFragmentAdithya Abraham Philip2015-06-271-40/+44
* | introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-279-511/+778
|/
* Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-263-15/+11
|\
| * disable automatic accept for own uid in RemoteService, and fix some warningsVincent Breitmoser2015-06-261-15/+8
| * Import R and BuildConfig explicitlyThialfihar2015-06-262-0/+3
* | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-266-186/+181
|\|
| * instrument: first couple of tests for OpenPGP APIVincent Breitmoser2015-06-261-0/+3
| * use KeyAdapter for AllowedKeysListFragmentVincent Breitmoser2015-06-263-135/+113
| * fix warnings in PassphraseCacheServiceVincent Breitmoser2015-06-261-13/+25
| * fixed fingerprint mismatch issueAdithya Abraham Philip2015-06-251-1/+1
| * Notification: follow design guidelines, fix #1313Dominik Schürmann2015-06-241-48/+31