aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
| | * | added retry on upload failureAdithya Abraham Philip2015-07-139-6/+121
| | * | allowed operations to modify CryptoInputParcel they receiveAdithya Abraham Philip2015-07-1322-57/+73
| | * | prevented passphrase caching on revocationAdithya Abraham Philip2015-07-136-17/+59
| | * | use only one DeleteDialogActivityAdithya Abraham Philip2015-07-138-351/+244
| | * | implemented revocation on deletionAdithya Abraham Philip2015-07-1327-305/+1059
* | | | update safeslinger lib (closes #1434)Vincent Breitmoser2015-07-151-1/+1
|/ / /
* | | fix verification of android support lib (broken in b59be903)Vincent Breitmoser2015-07-141-1/+1
* | | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-07-1416-37/+15
|\| |
| * | Remove unused iconDominik Schürmann2015-07-135-0/+0
| * | Use support.v7.app.AlertDialogDominik Schürmann2015-07-1310-37/+11
| * | check response code for upload errorAdithya Abraham Philip2015-07-101-0/+4
* | | Revert "Use snackbar lib from maven repo"Vincent Breitmoser2015-07-141-12/+12
|/ /
* | Version 3.4.1Dominik Schürmann2015-07-091-2/+2
* | Tests not working anymore on travis after using new annotation parameterDominik Schürmann2015-07-0914-57/+84
* | Fix strings nitpicks from transifexDominik Schürmann2015-07-091-2/+2
* | Get rid of robolectric workaround by using new annotation in robolectric 3.0Dominik Schürmann2015-07-0914-84/+57
* | Update robolectric, Workaround still neededDominik Schürmann2015-07-091-2/+2
* | add pseudo-static id property to CryptoOperationHelperVincent Breitmoser2015-07-0914-68/+44
* | run queued operations in onViewStateRestored, *after* onActivityCreatedVincent Breitmoser2015-07-091-2/+2
* | cryptoophelper: requested code must be saved between instances!Vincent Breitmoser2015-07-092-1/+27
* | multi-decrypt: save currentInputUri stateVincent Breitmoser2015-07-092-4/+16
* | backup: only ask for passphrase for secret keys which have oneVincent Breitmoser2015-07-091-40/+78
* | use onResumeFragments instead of onResume for fragment initializationVincent Breitmoser2015-07-091-2/+2
* | change wording of export dialog, remove "export secret" checkboxVincent Breitmoser2015-07-0817-72/+53
* | 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
* | | keylist: show delete as icon in multi-selectVincent Breitmoser2015-07-086-3/+2
* | | 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-083-33/+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-0812-96/+288
* | 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