aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
Commit message (Collapse)AuthorAgeFilesLines
* add more progress info from import routineVincent Breitmoser2014-06-161-2/+4
|
* import-log: minor improvementsVincent Breitmoser2014-06-121-4/+7
|
* import-log: properly distinguish return statesVincent Breitmoser2014-06-121-10/+7
|
* import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-101-19/+25
|
* import-log: more interface workVincent Breitmoser2014-06-101-2/+0
|
* import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-101-16/+29
|
* import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-061-7/+8
|
* do respect expectedFingerprint during key importVincent Breitmoser2014-06-041-1/+12
|
* neatness refactoringVincent Breitmoser2014-06-041-2/+2
|
* wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵Vincent Breitmoser2014-06-021-81/+21
| | | | ImportKeysListEntry
* wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-021-3/+3
|
* new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-271-8/+4
|
* wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-231-5/+14
|
* Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-211-3/+3
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * Rename KeyServer to KeyserverDominik Schürmann2014-05-181-3/+3
| |
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-211-3/+2
| |
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-141-4/+8
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml
| * Move logic classes for import into own sub-packageDominik Schürmann2014-05-061-5/+8
| |
* | wrapped-key-ring: more refactoring - no more pgp imports in ↵Vincent Breitmoser2014-05-031-1/+1
| | | | | | | | KeychainIntentService!
* | wrapped-key-ring: move certification logic into secretkeyVincent Breitmoser2014-05-031-40/+29
| |
* | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵Vincent Breitmoser2014-05-031-3/+5
|/ | | | signencrypt
* Rename ProgressDialogUpdater to ProgressableThialfihar2014-04-291-12/+12
| | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders.
* Removing remaining uses of Id, closing one of the oldest bugs #9Dominik Schürmann2014-04-141-17/+20
|
* Update license header for 2014Dominik Schürmann2014-04-131-1/+1
|
* Refactor ProviderHelper to be non-static using a constructor based on ↵Dominik Schürmann2014-04-111-5/+9
| | | | context (first commit to get context out of pgp classes)
* Use NotFoundException in more placesDominik Schürmann2014-04-081-6/+12
|
* Change license from ASLv2 to GPLv3 where possibleThialfihar2014-04-081-9/+10
|
* Update copyright timespan for ThialfiharThialfihar2014-04-081-1/+1
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+294