aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Start safe slinger activityDominik Schürmann2014-10-231-0/+43
* Externalize QR Code scanning and import into its own activity for better code...Dominik Schürmann2014-10-235-116/+232
* Fix crash on Android 5Dominik Schürmann2014-10-221-11/+16
* consistency for import UIDominik Schürmann2014-10-161-5/+27
* Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-162-8/+14
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-156-8/+60
|\
| * some cleanup and documentation of *Operation classesVincent Breitmoser2014-10-156-8/+60
* | More consisitencyDominik Schürmann2014-10-152-6/+6
* | More color/icon consistencyDominik Schürmann2014-10-155-20/+21
|/
* color experimentsDominik Schürmann2014-10-154-76/+82
* fix test for new PgpDecryptVerifyVincent Breitmoser2014-10-141-1/+3
* fix export performance problemsVincent Breitmoser2014-10-141-0/+5
* actually remove filter spinner code. that's what git is for~Vincent Breitmoser2014-10-131-46/+0
* Remove key list filter for nowDominik Schürmann2014-10-131-27/+27
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-135-2/+52
|\
| * Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-135-2/+52
* | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-134-120/+35
* | remove DELETE_FILE_SECURELYVincent Breitmoser2014-10-131-23/+0
|/
* forgot committing ExportResult classVincent Breitmoser2014-10-131-0/+60
* remove outdated AddKeysActivityVincent Breitmoser2014-10-131-463/+0
* rewrite export with new operation styleVincent Breitmoser2014-10-134-141/+212
* CertifyOperation is not a Pgp- operationVincent Breitmoser2014-10-124-42/+66
* fix logging in consolidate, part 2Vincent Breitmoser2014-10-111-11/+14
* DeleteResult: add custom createNotifyVincent Breitmoser2014-10-113-11/+117
* fix logging in consolidate, part 1Vincent Breitmoser2014-10-111-43/+47
* move delete into operation classVincent Breitmoser2014-10-114-33/+159
* move around package structure a bitVincent Breitmoser2014-10-1045-114/+99
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-105-64/+89
* add keys button goes to directly to qr scanVincent Breitmoser2014-10-102-8/+118
* keylist: add safeslinger exchange button to secret keysVincent Breitmoser2014-10-102-13/+182
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-0921-78/+140
|\
| * Better handling if no api key is selectedDominik Schürmann2014-10-091-1/+1
| * Better handling if no api key is selectedDominik Schürmann2014-10-092-8/+14
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-0920-70/+126
| * Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-0920-119/+150
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-091-1/+1
| |\
| * | Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-0920-150/+119
* | | Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2014-10-092-2/+2
|\ \ \
| * | | fix plurals quantity string in ImportKeyResultVincent Breitmoser2014-10-041-1/+1
| * | | yubikey: check with correct subkey id for sign operationVincent Breitmoser2014-10-041-1/+1
* | | | reduce memory footprint in QrCodeActivity as wellVincent Breitmoser2014-10-091-3/+16
* | | | reduce memory footprint of qr code in share tabVincent Breitmoser2014-10-092-18/+17
| |_|/ |/| |
* | | rename certify_key_item to the more appropriate multi_certify_itemVincent Breitmoser2014-10-081-1/+1
| |/ |/|
* | Remove unnecessary exceptionDominik Schürmann2014-10-082-9/+4
* | Big error screen if signature is invalid or key is revoked/expired, also fixe...Dominik Schürmann2014-10-084-36/+90
* | Handle revoked and expired keys in decrypt activityDominik Schürmann2014-10-081-17/+39
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-084-25/+15
|\ \
| * | remove ui hack, use padding instead of marginVincent Breitmoser2014-10-081-10/+0
| * | use "Key ID" for beautifyVincent Breitmoser2014-10-081-1/+1
| * | automatically extend single compound entry logsVincent Breitmoser2014-10-082-14/+14