aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-07-083-9/+14
|\ \
| * | fixed progress dialog not shown after enable orbot dialogAdithya Abraham Philip2015-07-082-8/+11
| * | fixed QR code scan and serialKeyImport progressAdithya Abraham Philip2015-07-082-2/+4
* | | hide keyboard before operations, tooVincent Breitmoser2015-07-082-0/+5
* | | grey out text color of key creation date for disabled itemsVincent Breitmoser2015-07-081-0/+1
* | | change title on backstack change in MainActivityVincent Breitmoser2015-07-081-0/+4
* | | hide keyboard on crypto error/successVincent Breitmoser2015-07-085-6/+27
|/ /
* | cleanup KeyListFragment, remove export all keysVincent Breitmoser2015-07-082-28/+14
* | Fix YubiKey importDominik Schürmann2015-07-081-9/+9
* | Do not ask for passphrase on deleteDominik Schürmann2015-07-081-9/+3
* | Rudimentary backup featureDominik Schürmann2015-07-088-79/+189
* | 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-081-14/+50
* | | multi-decrypt: add cancelled stateVincent Breitmoser2015-07-081-2/+49
* | | fix symmetric passphrase caching (fixes #1401)Vincent Breitmoser2015-07-084-16/+41
|/ /
* | comment for database fixVincent Breitmoser2015-07-081-0/+2
* | Simplifications for expiry dialogDominik Schürmann2015-07-081-6/+3
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-0825-212/+321
|\ \
| * | apply database fix for bogus rows introduced by issue #1402Vincent Breitmoser2015-07-081-4/+12
| * | fix expiry check in edit key uiVincent Breitmoser2015-07-081-6/+14
| * | 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-082-2/+7
| * | better handling of divert-to-card keys for subkey modificationsVincent Breitmoser2015-07-082-27/+49
| * | (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-074-74/+59
| * | 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-072-19/+19
|/ /
* | 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-075-22/+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-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
* | | 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
* | Disable YubiKey creationDominik Schürmann2015-07-061-6/+15
* | also catch DecoderException in decryptverifyVincent Breitmoser2015-07-061-2/+3
* | 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-062-9/+43
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 22:01:36 +0000