aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* 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-155-13/+11
* | More color/icon consistencyDominik Schürmann2014-10-157-27/+28
|/
* color experimentsDominik Schürmann2014-10-154-76/+82
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-143-30/+43
|\
| * Group passphrase cache settingsDominik Schürmann2014-10-132-24/+25
| * Register application/pgp-message for encrypted pgp data, more comments in Man...Dominik Schürmann2014-10-131-6/+18
* | 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-132-29/+29
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-1312-7/+61
|\
| * wordingDominik Schürmann2014-10-131-3/+3
| * Better qr code iconDominik Schürmann2014-10-134-0/+0
| * Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-138-4/+58
* | fix syntax typo in androidmanifestVincent Breitmoser2014-10-131-1/+1
* | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-134-120/+35
* | forgot to remove AddKeysActivity in androidmanifestVincent Breitmoser2014-10-131-11/+0
* | 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-135-141/+236
* 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-114-11/+137
* fix logging in consolidate, part 1Vincent Breitmoser2014-10-111-43/+47
* move delete into operation classVincent Breitmoser2014-10-115-33/+177
* move around package structure a bitVincent Breitmoser2014-10-1045-114/+99
* different wording in share tabVincent Breitmoser2014-10-101-1/+1
* fix width of displayed qr codeVincent Breitmoser2014-10-101-1/+1
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-105-64/+89
* add keys button goes to directly to qr scanVincent Breitmoser2014-10-103-9/+119
* keylist: add safeslinger exchange button to secret keysVincent Breitmoser2014-10-103-13/+208
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-0922-98/+168
|\
| * 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-093-28/+42
| * 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-092-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-082-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-086-91/+183
* | Handle revoked and expired keys in decrypt activityDominik Schürmann2014-10-0815-31/+55
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-29 00:00:54 +0000