Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatically recreate activities on theme change | Thialfihar | 2015-07-21 | 2 | -4/+62 |
| | |||||
* | Add theme setting | Thialfihar | 2015-07-21 | 11 | -10/+121 |
| | | | | | This prepares that different themes can be added. Currently light and dark will just use the default OK theme. | ||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-07-15 | 55 | -449/+1456 |
|\ | |||||
| * | Merge pull request #1435 from open-keychain/revocation-on-deletion | Dominik Schürmann | 2015-07-15 | 55 | -449/+1456 |
| |\ | | | | | | | Revocation on deletion | ||||
| | * | fixed multi-deletion bug, moved logic into DeleteKeyDialogActivity | Adithya Abraham Philip | 2015-07-15 | 4 | -21/+22 |
| | | | |||||
| | * | made mSignatureTime optional in CryptoOperationHelper | Adithya Abraham Philip | 2015-07-15 | 14 | -51/+112 |
| | | | |||||
| | * | added revocation tag NO_REASON to all revocations via PgpKeyOperation | Adithya Abraham Philip | 2015-07-14 | 2 | -1/+8 |
| | | | |||||
| | * | made PassphraseDialogActivity compatible with null CryptoInputParcel | Adithya Abraham Philip | 2015-07-13 | 3 | -6/+23 |
| | | | |||||
| | * | upload only public key in revocation | Adithya Abraham Philip | 2015-07-13 | 3 | -1/+16 |
| | | | |||||
| | * | corrected DeleteKeyDialogActivity finishing on cancel | Adithya Abraham Philip | 2015-07-13 | 1 | -9/+21 |
| | | | |||||
| | * | show key name on revoke/delete dialog | Adithya Abraham Philip | 2015-07-13 | 2 | -7/+24 |
| | | | |||||
| | * | made key deletion require double confirmation | Adithya Abraham Philip | 2015-07-13 | 1 | -1/+1 |
| | | | |||||
| | * | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 24 | -76/+133 |
| | | | |||||
| | * | added retry on upload failure | Adithya Abraham Philip | 2015-07-13 | 9 | -6/+121 |
| | | | |||||
| | * | allowed operations to modify CryptoInputParcel they receive | Adithya Abraham Philip | 2015-07-13 | 22 | -57/+73 |
| | | | |||||
| | * | prevented passphrase caching on revocation | Adithya Abraham Philip | 2015-07-13 | 6 | -17/+59 |
| | | | |||||
| | * | use only one DeleteDialogActivity | Adithya Abraham Philip | 2015-07-13 | 8 | -351/+244 |
| | | | |||||
| | * | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 27 | -305/+1059 |
| | | | |||||
* | | | update safeslinger lib (closes #1434) | Vincent Breitmoser | 2015-07-15 | 3 | -2/+2 |
|/ / | |||||
* | | fix verification of android support lib (broken in b59be903) | Vincent Breitmoser | 2015-07-14 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-07-14 | 16 | -37/+15 |
|\| | |||||
| * | Remove unused icon | Dominik Schürmann | 2015-07-13 | 5 | -0/+0 |
| | | |||||
| * | Use support.v7.app.AlertDialog | Dominik Schürmann | 2015-07-13 | 10 | -37/+11 |
| | | |||||
| * | Merge pull request #1438 from open-keychain/upload-error | Dominik Schürmann | 2015-07-13 | 1 | -0/+4 |
| |\ | | | | | | | Check upload response code and throw AddKeyException | ||||
| | * | check response code for upload error | Adithya Abraham Philip | 2015-07-10 | 1 | -0/+4 |
| |/ | |||||
* | | update snackbar with new animation flow | Vincent Breitmoser | 2015-07-14 | 1 | -0/+0 |
| | | |||||
* | | Revert "Use snackbar lib from maven repo" | Vincent Breitmoser | 2015-07-14 | 4 | -12/+16 |
|/ | | | | | | | | This reverts commit bfc57aefa5d9fd435e93589ea8a37c9747cb7814. Conflicts: OpenKeychain/build.gradle settings.gradle | ||||
* | Version 3.4.1 | Dominik Schürmann | 2015-07-09 | 1 | -2/+2 |
| | |||||
* | Tests not working anymore on travis after using new annotation parameter | Dominik Schürmann | 2015-07-09 | 14 | -57/+84 |
| | | | | | | Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0" This reverts commit 85a47d22f9bb1e4aaf5770c67416a5532977658e. | ||||
* | Fix strings nitpicks from transifex | Dominik Schürmann | 2015-07-09 | 1 | -2/+2 |
| | |||||
* | Get rid of robolectric workaround by using new annotation in robolectric 3.0 | Dominik Schürmann | 2015-07-09 | 14 | -84/+57 |
| | |||||
* | Update robolectric, Workaround still needed | Dominik Schürmann | 2015-07-09 | 1 | -2/+2 |
| | |||||
* | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 14 | -68/+44 |
| | |||||
* | run queued operations in onViewStateRestored, *after* onActivityCreated | Vincent Breitmoser | 2015-07-09 | 1 | -2/+2 |
| | |||||
* | cryptoophelper: requested code must be saved between instances! | Vincent Breitmoser | 2015-07-09 | 2 | -1/+27 |
| | |||||
* | multi-decrypt: save currentInputUri state | Vincent Breitmoser | 2015-07-09 | 2 | -4/+16 |
| | |||||
* | backup: only ask for passphrase for secret keys which have one | Vincent Breitmoser | 2015-07-09 | 1 | -40/+78 |
| | |||||
* | use onResumeFragments instead of onResume for fragment initialization | Vincent Breitmoser | 2015-07-09 | 1 | -2/+2 |
| | |||||
* | change wording of export dialog, remove "export secret" checkbox | Vincent Breitmoser | 2015-07-08 | 17 | -72/+53 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-07-08 | 3 | -9/+14 |
|\ | |||||
| * | Merge pull request #1429 from open-keychain/qr-fix | Dominik Schürmann | 2015-07-08 | 3 | -9/+14 |
| |\ | | | | | | | Fixed QR code import and serialKeyImport progress | ||||
| | * | fixed progress dialog not shown after enable orbot dialog | Adithya Abraham Philip | 2015-07-08 | 2 | -8/+11 |
| | | | |||||
| | * | fixed QR code scan and serialKeyImport progress | Adithya Abraham Philip | 2015-07-08 | 2 | -2/+4 |
| |/ | |||||
* | | keylist: show delete as icon in multi-select | Vincent Breitmoser | 2015-07-08 | 7 | -4/+4 |
| | | |||||
* | | hide keyboard before operations, too | Vincent Breitmoser | 2015-07-08 | 2 | -0/+5 |
| | | |||||
* | | grey out text color of key creation date for disabled items | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 |
| | | |||||
* | | change title on backstack change in MainActivity | Vincent Breitmoser | 2015-07-08 | 1 | -0/+4 |
| | | |||||
* | | hide keyboard on crypto error/success | Vincent Breitmoser | 2015-07-08 | 5 | -6/+27 |
|/ | |||||
* | cleanup KeyListFragment, remove export all keys | Vincent Breitmoser | 2015-07-08 | 3 | -33/+14 |
| | |||||
* | Fix YubiKey import | Dominik Schürmann | 2015-07-08 | 1 | -9/+9 |
| |