aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
Commit message (Collapse)AuthorAgeFilesLines
* db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-041-1/+1
|
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-031-4/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Rearrange too long linesThialfihar2014-04-021-1/+2
| |
| * Fully qualified importsDominik Schürmann2014-04-011-3/+12
| |
* | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* Fix export for new unified key list #409uberspot2014-03-151-30/+39
|
* final code style changesuberspot2014-03-131-2/+4
|
* fix code style in /pgpuberspot2014-03-131-26/+15
|
* Export cancellable - minor changesgrait2014-03-131-5/+3
|
* Export is cancellable nowgrait2014-03-131-2/+22
|
* fix plenty of lint warnings, make some for loops into foreach, remove unused ↵uberspot2014-03-111-3/+5
| | | | imports and throw exceptions
* Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-111-33/+27
|
* Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-091-1/+1
|
* remove unused imports and unthrown exceptionsuberspot2014-03-071-6/+0
|
* corrected commitAnkush2014-03-071-2/+2
| | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
* importing progress dialog language fixedDominik Schürmann2014-02-011-5/+6
|
* importing progress dialog language fixedDominik Schürmann2014-02-011-1/+1
|
* Reworking import, testing needed...Dominik Schürmann2014-02-011-64/+28
|
* exporting secret keys means exporting public, no need to do so twiceAshley Hughes2014-01-281-25/+22
|
* New Gradle project structureDominik Schürmann2014-01-271-0/+314
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 18:35:00 +0000