aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 passphrase dialog creation
| | * Simplify PassphraseDialogFragment usageThialfihar2014-04-047-153/+89
| |/ | | | | | | | | Move boiler plate code into a simple static show() method, which only requires a Handler and can be used ad hoc in any FragmentActivity.
* | 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
| |\ | | | | | | | | | Valodim-db-overhaul
| * | 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
| | | | | | | | | | | | | | | 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-03113-1011/+1322
|\| | | | | | | | | | | | | | | | | | | | | | | | | 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
| |
| * clarify readmeDominik Schürmann2014-04-031-1/+1
| |
| * Merge pull request #508 from thi/naming-adjustmentsDominik Schürmann2014-04-0215-106/+106
| |\ | | | | | | Naming adjustments
| | * 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
| |\ | | | | | | Fix wildcard imports
| | * 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
| |/
| * Update from transifexDominik Schürmann2014-04-0232-270/+217
| |
| * Merge pull request #502 from thi/conform-to-style-guideDominik Schürmann2014-04-0268-464/+538
| |\ | | | | | | Conform to style guide, #466
| | * Suppress checkstyle for some filesThialfihar2014-04-022-2/+14
| | |
| | * 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 04:45:56 +0000