aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-06133-26804/+0
* Optimize comments, remove dead codeDominik Schürmann2014-04-066-47/+5
* Use dark icon in warning dialogs in edit keyDominik Schürmann2014-04-061-2/+2
* code styleDominik Schürmann2014-04-063-14/+12
* copyright header correction, style fixesDominik Schürmann2014-04-062-48/+49
* certs: remove unused menu itemVincent Breitmoser2014-04-061-3/+0
* certs: change migration routine so certifications workVincent Breitmoser2014-04-061-3/+27
* certs: display green dot for certified keys in KeyListFragmentVincent Breitmoser2014-04-063-4/+27
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-0611-138/+98
|\
| * 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-056-14/+15
| * Use PgpKeyHelper.splitUserId in EncryptAsymmetricFragmentDominik Schürmann2014-04-051-12/+11
| * Fix nfc, make edit activity like a modal dialog, move all menu actions into v...Dominik Schürmann2014-04-055-115/+65
* | certs: ditch expiry, re-add data blob, improve ViewCertActivityVincent Breitmoser2014-04-065-33/+72
* | certs: fix ViewCertActivityVincent Breitmoser2014-04-064-28/+53
* | certs: fix CertifyKeyActivity and improve user id listVincent Breitmoser2014-04-063-33/+31
* | certs: ditch selection spinner from certs viewVincent Breitmoser2014-04-061-38/+0
* | certs: display cert type in cert viewVincent Breitmoser2014-04-061-11/+19
* | certs: display uid status in uid listVincent Breitmoser2014-04-064-11/+27
* | certs: properly handle primary flag and revocation of uidsVincent Breitmoser2014-04-065-66/+109
* | certs: various improvementsVincent Breitmoser2014-04-056-30/+55
* | certs: more fixes, almost working nowVincent Breitmoser2014-04-055-38/+52
* | Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-05106-5935/+7609
|\|
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-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-047-70/+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-049-143/+163
| |\|
| | * title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik 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
| | |\
| | * | ChangelogDominik Schürmann2014-04-031-1/+1
| | * | Key lookup for APIDominik Schürmann2014-04-031-5/+7
| | * | Key lookup for APIDominik Schürmann2014-04-032-7/+16
| | * | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-038-132/+141
| * | | 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-046-9/+23
| * | | 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-0370-702/+1021
| |\|
| | * Cleanup DrawerActivityDominik Schürmann2014-04-031-31/+4
| | * Rename "canEdit" to "canBeEdited"Thialfihar2014-04-024-13/+13
| | * Rename "armour" to "armor"Thialfihar2014-04-024-16/+16
| | * Rename "pass phrase" to "passphrase"Thialfihar2014-04-0210-73/+73