aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use AppMsg in edit keyDominik Schürmann2014-04-051-8/+6
* Remove import activity from drawer, make it reachable from key list onlyDominik Schürmann2014-04-058-35/+32
* Use PgpKeyHelper.splitUserId in EncryptAsymmetricFragmentDominik Schürmann2014-04-051-12/+11
* Rework menu itemsDominik Schürmann2014-04-058-10/+14
* Fix nfc, make edit activity like a modal dialog, move all menu actions into v...Dominik Schürmann2014-04-057-141/+66
* Change headers in encrypt activity to be more descriptiveDominik Schürmann2014-04-041-2/+2
* Merge pull request #513 from Valodim/db-overhaulDominik Schürmann2014-04-0425-896/+708
|\
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-047-153/+89
| |\ | |/ |/|
* | Merge pull request #512 from thi/simplify-passphrase-dialog-creationDominik Schürmann2014-04-047-153/+89
|\ \
| * | Simplify PassphraseDialogFragment usageThialfihar2014-04-047-153/+89
|/ /
| * db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-048-81/+77
| * db-overhaul: fix delete key from ViewKeyActivityVincent Breitmoser2014-04-043-15/+12
| * ViewKeyMainFragment cleanup (don't use inline queries!)Vincent Breitmoser2014-04-041-96/+77
| * db-overhaul: fix DecryptAndVerify with and without known keysVincent Breitmoser2014-04-041-51/+59
| * db-overhaul: workaround api level 11Vincent Breitmoser2014-04-045-32/+42
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-0442-170/+445
| |\ | |/ |/|
* | title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-031-2/+2
* | Callback for OpenPgpServiceConnectionDominik Schürmann2014-04-031-0/+33
* | simplify OpenPgpServiceConnectionDominik Schürmann2014-04-031-5/+2
* | Keychain API Demo 3Dominik Schürmann2014-04-031-2/+2
* | Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ...Dominik Schürmann2014-04-0326-1407/+635
|\ \
* | | Disable testsDominik Schürmann2014-04-031-1/+1
* | | version 2.5Dominik Schürmann2014-04-031-2/+2
* | | Update from transifexDominik Schürmann2014-04-0325-1/+221
* | | ChangelogDominik Schürmann2014-04-033-2/+8
* | | Key lookup for APIDominik Schürmann2014-04-032-6/+8
* | | Key lookup for APIDominik Schürmann2014-04-032-7/+16
* | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-0310-147/+155
| | * db-overhaul: different hack for type info (api level problem inside)Vincent Breitmoser2014-04-041-18/+6
| | * calculate nfc packet on demand onlyVincent Breitmoser2014-04-041-20/+18
| | * db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-047-10/+25
| | * db-overhaul: reintroduce by-mail and by-subkey queriesVincent Breitmoser2014-04-045-78/+109
| | * db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-048-78/+73
| | * db-overhaul: more work on new providerVincent Breitmoser2014-04-0310-263/+208
| | * more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-0310-223/+148
| | * ditch useless PgpKeyHelper.getMasterKey methodsVincent Breitmoser2014-04-037-100/+23
| |/
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-03113-1011/+1322
| |\ | |/ |/|
* | Cleanup DrawerActivityDominik Schürmann2014-04-031-31/+4
* | clarify readmeDominik Schürmann2014-04-031-1/+1
* | Merge pull request #508 from thi/naming-adjustmentsDominik Schürmann2014-04-0215-106/+106
|\ \
| * | Rename "canEdit" to "canBeEdited"Thialfihar2014-04-024-13/+13
| * | Rename "armour" to "armor"Thialfihar2014-04-026-20/+20
| * | Rename "pass phrase" to "passphrase"Thialfihar2014-04-0210-73/+73
|/ /
* | Cleanup example codeDominik Schürmann2014-04-021-7/+7
* | Started changelog for 2.5Dominik Schürmann2014-04-021-0/+8
* | Fix buildDominik Schürmann2014-04-021-0/+2
* | Merge pull request #507 from thi/fix-wildcard-importsDominik Schürmann2014-04-0215-25/+135
|\ \
| * | Add wildcard import warning to checkstyle configurationThialfihar2014-04-021-1/+7
| * | Replace wildcard imports with explicit importsThialfihar2014-04-0213-21/+126
| * | Spacing correctionsThialfihar2014-04-021-3/+2
|/ /