aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-0438-162/+401
|\
| * 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
| |\ | | | | | | | | | Valodim-db-overhaul
| * | version 2.5Dominik Schürmann2014-04-031-2/+2
| | |
| * | Update from transifexDominik Schürmann2014-04-0325-1/+221
| | |
| * | ChangelogDominik Schürmann2014-04-032-2/+2
| | |
| * | 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
| | | | | | | | | | | | | | | the only thing left to fix after the db upgrade (that I can think of right now) are key exports
* | | db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-048-78/+73
| | |
* | | db-overhaul: more work on new providerVincent Breitmoser2014-04-0310-263/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifics: - secret keys are preserved when a new public key is inserted - started work to give virtual columns a representation in the contract class - streamline ProviderHelper methods. the getUnifiedData method relies on a api level 11 method, not sure yet how to fix/workaround that... - many more small things work as they did before
* | | 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-03108-1000/+1293
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * Cleanup DrawerActivityDominik Schürmann2014-04-031-31/+4
| |
| * 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
| |
| * Started changelog for 2.5Dominik Schürmann2014-04-021-0/+8
| |
| * Fix buildDominik Schürmann2014-04-021-0/+2
| |
| * Replace wildcard imports with explicit importsThialfihar2014-04-0213-21/+126
| |
| * Spacing correctionsThialfihar2014-04-021-3/+2
| |
| * Update from transifexDominik Schürmann2014-04-0232-270/+217
| |
| * Add missing and curly brackets and fix othersThialfihar2014-04-027-60/+61
| | | | | | | | | | Style guide demands them even for single-line blocks, and opening curly brackets never appear on a line on their own.
| * Rearrange too long linesThialfihar2014-04-0228-145/+228
| |
| * Adjust variable/member naming to conform to style guideThialfihar2014-04-0211-79/+82
| | | | | | | | | | In some cases change member accessibility, so the naming matches. Also, some key words were reordered to comply with JLS suggestions.
| * 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-022-1/+47
| |
| * 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 ↵Ashley Hughes2014-04-015-2/+22
| | | | | | | | being empty
| * sort out saving empty string IDsAshley Hughes2014-04-011-9/+3
| |
| * Menu cleanupDominik Schürmann2014-04-014-28/+47
| |
| * 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
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change entire database design. This introduces a lot of changes, notably all URIs and almost all projections. Some features (like key deletion) have been simply commented out for now since they need serious reconsideration. There are a couple of new TODOs marking places where more work is needed. The migration path works fine from what I tested. The old database is not deleted for now, ie, it is reimported at every start of the application making all intermediate changes transient. Tested and working (for me): - All activities in the main drawer - Multiselect and Search - ViewKeyActivity, with and without secret key available - CertifyKeyActivity - SelectSecretKeyActivity (from CertifyKeyActivity) - SelectPublicKeyActivity (from encrypt activity) What doesn't work: - Actually certifying keys (pending a TODO in ProviderHelper) - Importing keys doesn't preserve secret keys - "Encrypt to this contact" doesn't pass key - Editing keys. All controls are disabled, I'm not sure why... (is this even my fault?) - Deleting keys What I didn't test: - Key export - API stuff - Creating keys (since editing doesn't even work)
* Remove DECRYPT_ASSUME_SYMMETRICDominik Schürmann2014-04-012-6/+0
|
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-016-117/+236
|\
| * test: add junit+robolectric to buildfiles and stub test fileVincent Breitmoser2014-04-011-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 04:09:03 +0000