aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-046-151/+73
|\
| * Simplify PassphraseDialogFragment usageThialfihar2014-04-046-151/+73
* | db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-045-28/+42
* | db-overhaul: fix delete key from ViewKeyActivityVincent Breitmoser2014-04-042-11/+9
* | ViewKeyMainFragment cleanup (don't use inline queries!)Vincent Breitmoser2014-04-041-96/+77
* | db-overhaul: workaround api level 11Vincent Breitmoser2014-04-044-17/+19
* | Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-047-120/+151
|\|
| * 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-0312-168/+132
| |\
| * | Key lookup for APIDominik Schürmann2014-04-031-2/+11
| * | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-037-119/+141
* | | calculate nfc packet on demand onlyVincent Breitmoser2014-04-041-20/+18
* | | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-043-3/+13
* | | db-overhaul: reintroduce by-mail and by-subkey queriesVincent Breitmoser2014-04-041-17/+5
* | | db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-045-9/+10
* | | db-overhaul: more work on new providerVincent Breitmoser2014-04-036-75/+58
* | | more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-037-141/+85
* | | ditch useless PgpKeyHelper.getMasterKey methodsVincent Breitmoser2014-04-032-7/+6
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-0335-435/+527
|\|
| * Cleanup DrawerActivityDominik Schürmann2014-04-031-31/+4
| * Rename "canEdit" to "canBeEdited"Thialfihar2014-04-024-13/+13
| * Rename "armour" to "armor"Thialfihar2014-04-022-11/+11
| * Rename "pass phrase" to "passphrase"Thialfihar2014-04-024-31/+31
| * Replace wildcard imports with explicit importsThialfihar2014-04-028-11/+64
| * Spacing correctionsThialfihar2014-04-021-3/+2
| * Add missing and curly brackets and fix othersThialfihar2014-04-025-50/+47
| * Rearrange too long linesThialfihar2014-04-0216-48/+87
| * Adjust variable/member naming to conform to style guideThialfihar2014-04-029-70/+73
| * Trivial spacing changes to conform to style guideThialfihar2014-04-0218-57/+56
| * Adjust copyright headersThialfihar2014-04-022-2/+2
| * Adjust import orderThialfihar2014-04-0211-49/+24
| * always askAshley Hughes2014-04-021-1/+1
| * confirm that empty IDs are really wantedAshley Hughes2014-04-021-1/+46
| * allow blank IDs, allow adding new IDs and let them be masterAshley Hughes2014-04-021-2/+5
| * pass through info that keys are new without relying on new keys orginally bei...Ashley Hughes2014-04-013-0/+13
| * Menu cleanupDominik Schürmann2014-04-011-4/+5
| * Dont show encrypted data before decryption from clipboardDominik Schürmann2014-04-011-7/+14
| * CleanupDominik Schürmann2014-04-012-79/+55
| * Automatically select newly created key in api accountsDominik Schürmann2014-04-012-16/+19
| * Fully qualified importsDominik Schürmann2014-04-011-0/+3
* | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-0312-142/+103
|/
* Remove DECRYPT_ASSUME_SYMMETRICDominik Schürmann2014-04-012-6/+0
* Fix symmetric decryptionDominik Schürmann2014-04-012-0/+6
* Fix pre-selection for encryptDominik Schürmann2014-04-011-4/+2
* Fix layoutsDominik Schürmann2014-04-011-0/+1
* Simplify encrypt and sign backendDominik Schürmann2014-04-012-17/+5
* Fix symmetric encryption and cleanupDominik Schürmann2014-04-016-124/+77
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-012-21/+20
|\
| * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-3/+4
| * change how new default keys are passed back, fix showing their usage flagsAshley Hughes2014-03-312-20/+18
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 17:39:15 +0000