aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
Commit message (Expand)AuthorAgeFilesLines
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-101-305/+0
* use sub results in importVincent Breitmoser2014-10-051-2/+6
* Pass imported master key ids via result parcelDominik Schürmann2014-10-041-2/+12
* redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-041-1/+0
* clean up PgpImportExport a bitVincent Breitmoser2014-10-031-7/+5
* package reordering: merge util and helper, there were no real difference; cre...Dominik Schürmann2014-09-171-2/+3
* move LogLevel info into LogType enumVincent Breitmoser2014-09-151-2/+1
* work on OperationResultParcelVincent Breitmoser2014-09-141-3/+3
* promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-5/+5
* remove broken(?) cancellation codeVincent Breitmoser2014-09-011-30/+0
* add cancel prevention mechanism, improve cancellation for key importVincent Breitmoser2014-08-311-13/+15
* Add cancelable mechanism and support in key importVincent Breitmoser2014-08-311-2/+21
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-201-7/+3
|\
| * Upload key workingDominik Schürmann2014-08-201-7/+3
* | make number of secret keys imported part of ImportResult parcelVincent Breitmoser2014-08-201-3/+6
|/
* consolidate: working implementation, lacking uiVincent Breitmoser2014-08-171-6/+15
* Dont write version header by defaultDominik Schürmann2014-08-141-2/+8
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-4/+4
* some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-11/+11
* fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-281-2/+10
* Fix keybase importDominik Schürmann2014-06-201-0/+2
* fix key exportVincent Breitmoser2014-06-181-1/+1
* consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-1/+2
* 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 Import...Vincent Breitmoser2014-06-021-81/+21
* 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
|\
| * 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
|\|
| * 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 KeychainIntentSer...Vincent Breitmoser2014-05-031-1/+1
* | 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 si...Vincent Breitmoser2014-05-031-3/+5
|/
* Rename ProgressDialogUpdater to ProgressableThialfihar2014-04-291-12/+12
* 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 context...Dominik Schürmann2014-04-111-5/+9
* Use NotFoundException in more placesDominik Schürmann2014-04-081-6/+12
* Change license from ASLv2 to GPLv3 where possibleThialfihar2014-04-081-9/+10