aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Fix buildDominik Schürmann2014-04-021-0/+2
| * Replace wildcard imports with explicit importsThialfihar2014-04-0213-21/+126
| * Spacing correctionsThialfihar2014-04-021-3/+2
| * Add missing and curly brackets and fix othersThialfihar2014-04-027-60/+61
| * Rearrange too long linesThialfihar2014-04-0228-145/+228
| * Adjust variable/member naming to conform to style guideThialfihar2014-04-0211-79/+82
| * Trivial spacing changes to conform to style guideThialfihar2014-04-0229-85/+87
| * Adjust copyright headersThialfihar2014-04-026-12/+20
| * Adjust import orderThialfihar2014-04-0224-81/+46
| * always askAshley Hughes2014-04-021-1/+1
| * confirm that empty IDs are really wantedAshley Hughes2014-04-021-1/+46
| * new ID sigs already added, so do save themAshley Hughes2014-04-021-1/+1
| * allow blank IDs, allow adding new IDs and let them be masterAshley Hughes2014-04-022-5/+8
| * pass through info that keys are new without relying on new keys orginally bei...Ashley Hughes2014-04-015-2/+22
| * sort out saving empty string IDsAshley Hughes2014-04-011-9/+3
| * Menu cleanupDominik Schürmann2014-04-011-4/+5
| * Dont show encrypted data before decryption from clipboardDominik Schürmann2014-04-011-7/+14
| * Change path to OpenKeychainDominik Schürmann2014-04-011-3/+8
| * Only allow private keys associated to accounts of an appDominik Schürmann2014-04-014-18/+39
| * CleanupDominik Schürmann2014-04-012-79/+55
| * Automatically select newly created key in api accountsDominik Schürmann2014-04-014-18/+47
| * Fully qualified importsDominik Schürmann2014-04-017-19/+99
* | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-0325-1367/+598
|/
* Remove DECRYPT_ASSUME_SYMMETRICDominik Schürmann2014-04-012-6/+0
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-015-116/+235
|\
| * PgpKeyOperation: factor out all android dependenciesVincent Breitmoser2014-04-015-116/+235
* | default to allow symmetric decryptionDominik Schürmann2014-04-011-1/+1
|/
* Fix symmetric decryptionDominik Schürmann2014-04-015-117/+117
* 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-013-115/+59
* Fix symmetric encryption and cleanupDominik Schürmann2014-04-018-136/+91
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-013-26/+39
|\
| * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-3/+4
| * create three keys by defaultAshley Hughes2014-03-311-1/+8
| * change how new default keys are passed back, fix showing their usage flagsAshley Hughes2014-03-313-24/+29
* | Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-0110-857/+1265
|/