aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-102-10/+11
|\
| * Merge pull request #545 from danielhass/toast_replacementDominik Schürmann2014-04-102-10/+11
| |\
| | * Deleted wrong AppMsgDaniel Haß2014-04-101-3/+0
| | * Replaced Toasts in ViewKeyActivityDaniel Haß2014-04-091-7/+11
| | * Removed unused Toast import in ViewKeyActivityJBDaniel Haß2014-04-091-1/+0
| | * Replaced Toasts in ImportKeysOrCodeFragmentDaniel Haß2014-04-091-3/+3
* | | Integrate NFC functionality into ViewKeyActivityDominik Schürmann2014-04-104-157/+111
|/ /
* | Prettify more layouts, fix edit and encrypt intents from key viewDominik Schürmann2014-04-096-19/+35
* | Temporary disable of master key id extraction from uriDominik Schürmann2014-04-091-7/+7
* | Prettify some layoutsDominik Schürmann2014-04-096-48/+45
* | certs: fix verification in ViewKeyActivity (how embarassing)Vincent Breitmoser2014-04-091-2/+2
* | Fix gitignore for lintDominik Schürmann2014-04-092-6/+5
* | Fix certification layoutDominik Schürmann2014-04-091-29/+21
* | Fix NFCDominik Schürmann2014-04-092-45/+50
* | Fix save keyring, improve signature verificationDominik Schürmann2014-04-096-101/+108
|/
* Cleanup in SelectKeyCursorAdapterDominik Schürmann2014-04-092-9/+3
* Hide keyboard after hiding custom key length fieldDominik Schürmann2014-04-091-1/+9
* Merge pull request #539 from gogowitczak/custom-key-length-infoDominik Schürmann2014-04-094-41/+111
|\
| * Modified Spinner values for CreateKeyDialog. Added info for user about custom...gogowitczak2014-04-084-41/+111
* | KeychainIntentService instead of APGDominik Schürmann2014-04-091-1/+1
* | Fix DECRYPT and SEND intentDominik Schürmann2014-04-091-1/+1
* | Use NotFoundException in more placesDominik Schürmann2014-04-0812-85/+141
* | Fix decryption of messages/files encrypted for multiple public keysDominik Schürmann2014-04-081-31/+56
* | Introduce ProviderHelper.NotFoundException, remove dead codeDominik Schürmann2014-04-0812-128/+152
|/
* Merge pull request #537 from thi/change-license-to-gplDominik Schürmann2014-04-0845-444/+480
|\
| * Change license from ASLv2 to GPLv3 where possibleThialfihar2014-04-0843-403/+439
| * Update copyright timespan for ThialfiharThialfihar2014-04-0841-49/+49
|/
* Merge pull request #536 from gogowitczak/custom-key-lengthDominik Schürmann2014-04-084-22/+152
|\