aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* shifted proxy checking to ImportKeysListCloudLoaderAdithya Abraham Philip2015-07-089-67/+126
* comment for database fixVincent Breitmoser2015-07-081-0/+2
* put encryptdecrypt overview into a scrollviewVincent Breitmoser2015-07-081-100/+107
* Simplifications for expiry dialogDominik Schürmann2015-07-081-6/+3
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-0826-212/+326
|\
| * apply database fix for bogus rows introduced by issue #1402Vincent Breitmoser2015-07-081-4/+12
| * fix expiry check in edit key uiVincent Breitmoser2015-07-082-8/+17
| * no progress dialog for bind action in view key / yubikey fragmentVincent Breitmoser2015-07-081-1/+1
| * some cleanup and fix for back button in ImportKeysActivity (fixes #1372)Vincent Breitmoser2015-07-087-30/+21
| * fix result type for divert-to-card new subkey errorVincent Breitmoser2015-07-081-1/+1
| * addition of subkeys for divert-to-card primary keys is not supportedVincent Breitmoser2015-07-083-2/+8
| * better handling of divert-to-card keys for subkey modificationsVincent Breitmoser2015-07-083-27/+50
| * (missed a couple files in last commit)Vincent Breitmoser2015-07-082-6/+10
| * use QueueingCryptoOperationFragment in all other placesVincent Breitmoser2015-07-075-22/+38
| * introduce QueueingCryptoOperationFragment to queue result handling in detache...Vincent Breitmoser2015-07-075-13/+87
| * try cache in certify operation (fixes #1242)Vincent Breitmoser2015-07-075-74/+61
| * move queued action handling from prev commit into onActivityCreatedVincent Breitmoser2015-07-071-31/+27
* | Temporary fix for multi exportDominik Schürmann2015-07-082-24/+31
* | Clarifications in remote API codeDominik Schürmann2015-07-073-21/+21
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-071-37/+90
|\
| * handle getActivity() by queueing results in CreateKeyFinalFragmentVincent Breitmoser2015-07-071-37/+90
* | Package cert not sigDominik Schürmann2015-07-0722-40/+40
|/
* linked proxy settings to other proxy checkboxAdithya Abraham Philip2015-07-071-7/+22
* fix passphrase->deletion ui flow for secret keys, and disregard cacheVincent Breitmoser2015-07-071-38/+24
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-079-68/+61
|\
| * fix some nullpointers from proxy implementationVincent Breitmoser2015-07-072-3/+8
| * fix handling of progress dialog creation in CryptoOperationFragment (fixes #1...Vincent Breitmoser2015-07-076-64/+52
| * tests: make sure encryption happens to all enc-capable subkeysVincent Breitmoser2015-07-071-1/+1
* | strings: digits instead of numbersDominik Schürmann2015-07-071-1/+1
* | Simplify getLineSeparator in PgpDecryptVerifyDominik Schürmann2015-07-071-7/+1
|/
* actually disable non-enabled items in keyspinner (in keyadapter) (fixes #1366)Vincent Breitmoser2015-07-063-15/+34
* Pull from transifexDominik Schürmann2015-07-0657-220/+759
* Changelog 3.4Dominik Schürmann2015-07-061-0/+5
* Disable YubiKey creationDominik Schürmann2015-07-061-6/+15
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-061-2/+3
|\
| * also catch DecoderException in decryptverifyVincent Breitmoser2015-07-061-2/+3
* | Better error string for too short PINDominik Schürmann2015-07-061-9/+9
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-063-21/+17
|\
| * don't cache exporthelper, keep type for KeyItem in KeySpinnerVincent Breitmoser2015-07-063-21/+17
* | Save mTagHandlingEnabled in saved instanceDominik Schürmann2015-07-061-1/+16
|/
* Better YubiKey UX flow for error handlingDominik Schürmann2015-07-064-42/+103
* Change signed by to sign withDominik Schürmann2015-07-061-1/+1
* Poll if yubikey has been taken awayDominik Schürmann2015-07-062-9/+14
* Fix account key selection for APIDominik Schürmann2015-07-061-1/+6
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-0671-414/+2255
|\
| * encrypt to all encryption subkeys, rather than just the firstVincent Breitmoser2015-07-063-22/+27
| * catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown fr...Vincent Breitmoser2015-07-062-1/+8
| * forgot a couple lines to commitVincent Breitmoser2015-07-062-2/+16
| * nicer error msg if input data cannot be readVincent Breitmoser2015-07-063-3/+5
| * cleanup, NonNull annotation, never return null in PgpDecryptVerifyVincent Breitmoser2015-07-0613-74/+92
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:38:44 +0000