aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #1424 from open-keychain/import-proxyDominik Schürmann2015-07-089-67/+126
|\ \
| * | shifted proxy checking to ImportKeysListCloudLoaderAdithya Abraham Philip2015-07-089-67/+126
* | | multi-decrypt: add retry mechanismVincent Breitmoser2015-07-082-15/+63
* | | multi-decrypt: add cancelled stateVincent Breitmoser2015-07-082-2/+69
* | | fix symmetric passphrase caching (fixes #1401)Vincent Breitmoser2015-07-085-16/+42
|/ /
* | 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-0828-220/+357
|\ \
| * | 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-085-35/+81
| * | (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
|/ /
* | Merge pull request #1416 from open-keychain/proxy-settingsDominik Schürmann2015-07-071-7/+22
|\ \
| * | 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-0711-79/+181
|\ \
| * | 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-073-12/+121
* | | strings: digits instead of numbersDominik Schürmann2015-07-071-1/+1
* | | Simplify getLineSeparator in PgpDecryptVerifyDominik Schürmann2015-07-071-7/+1
|/ /
* | Ignore lint errors in keybase libDominik Schürmann2015-07-061-0/+0
* | Version 3.4Dominik Schürmann2015-07-061-2/+2
* | 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