aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-153-3/+34
|\
| * add WoT help file to transifex configVincent Breitmoser2014-04-151-0/+5
| * add web of trust help entryVincent Breitmoser2014-04-152-3/+29
* | Add OpenPgpSignatureResultBuilderDominik Schürmann2014-04-151-0/+117
* | encapsulate creation of OpenPgpSignatureResult objects inside OpenPgpSignatur...Dominik Schürmann2014-04-151-51/+33
|/
* Some comments to ConstantsDominik Schürmann2014-04-141-1/+2
* Removing remaining uses of Id, closing one of the oldest bugs #9Dominik Schürmann2014-04-1426-183/+126
* KeychainDatabase cleanupDominik Schürmann2014-04-141-21/+27
* Merge pull request #564 from Valodim/db-backupDominik Schürmann2014-04-143-10/+95
|\
| * move old apg.db to apg_old.db (half measure~)Vincent Breitmoser2014-04-141-12/+8
| * add debug backup/restore options to main menuVincent Breitmoser2014-04-143-1/+90
|/
* Translations from transifexDominik Schürmann2014-04-1410-57/+251
* Fix SIGNATURE_SUCCESS_CERTIFIEDDominik Schürmann2014-04-141-4/+4
* key edit: fix crash when create date was after expiry date, change from grego...Dominik Schürmann2014-04-1420-168/+207
* Rework verifyCleartextSignatureDominik Schürmann2014-04-131-74/+98
* Implement SIGNATURE_SUCCESS_CERTIFIED in PgpDecryptVerify (not tested)Dominik Schürmann2014-04-132-13/+31
* Handle new exceptions in KeychainIntentServiceDominik Schürmann2014-04-133-17/+23
* Remove unused blob classes and other dead codeDominik Schürmann2014-04-1312-435/+30
* Update license header for 2014Dominik Schürmann2014-04-1348-83/+83
* More changes to PgpSignEncryptDominik Schürmann2014-04-123-37/+48
* PgpSignEncrypt commentDominik Schürmann2014-04-111-0/+2
* Clarify use of methods in PgpKeyHelperDominik Schürmann2014-04-113-6/+6
* More ids removedDominik Schürmann2014-04-113-60/+28
* More fixes for import item layoutDominik Schürmann2014-04-111-46/+56
* Remove some Ids...Dominik Schürmann2014-04-119-189/+45
* Simplify and fix delete key dialogDominik Schürmann2014-04-113-49/+8
* PgpDecryptVerify is now context-freeDominik Schürmann2014-04-113-23/+81
* put signatureType where it belongsDominik Schürmann2014-04-111-8/+8
* PgpSignEncrypt is now context-freeDominik Schürmann2014-04-114-22/+51
* PgpSignEncrypt: merge generateSignature() into main methodDominik Schürmann2014-04-111-127/+79
* PgpSignEncrypt: get by master key idDominik Schürmann2014-04-111-2/+2
* More cleanup in providerHelperDominik Schürmann2014-04-111-13/+10
* Refactor ProviderHelper to be non-static using a constructor based on context...Dominik Schürmann2014-04-1123-228/+266
* Remove queries from PgpKeyHelper, introduce encrypt to signer mode (not tested)Dominik Schürmann2014-04-118-66/+66
* Prettify view_key_userids_itemDominik Schürmann2014-04-111-4/+4
* Prettify more layoutsDominik Schürmann2014-04-115-104/+100
* Merge pull request #553 from Valodim/split-masterKeyIdDominik Schürmann2014-04-1115-244/+244
|\
| * split getMasterKeyId for the remaining use casesVincent Breitmoser2014-04-115-16/+19
| * get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredStringVincent Breitmoser2014-04-117-88/+101
| * fix EditKeyActivityVincent Breitmoser2014-04-112-50/+46
| * display correct primary user id in import dialogue MOSTLYVincent Breitmoser2014-04-102-21/+41
| * remove drawer layout remnants from import key dialogueVincent Breitmoser2014-04-103-78/+46
|/
* use view holder pattern in KeyListFragmentVincent Breitmoser2014-04-101-36/+49
* Merge pull request #550 from Valodim/select-fragmentDominik Schürmann2014-04-107-138/+212
|\
| * Select*KeyFragment rewritesVincent Breitmoser2014-04-107-138/+212
|/
* ViewCertActivity cleanupVincent Breitmoser2014-04-103-15/+19
* Disable selection of user ids and keys in view keyDominik Schürmann2014-04-103-2/+35
* Minimize use of class variables in ViewKeyDominik Schürmann2014-04-101-6/+6
* Cleanup AsyncTask code for NFCDominik Schürmann2014-04-101-6/+8
* Cleanup importsDominik Schürmann2014-04-101-2/+0