diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-25 06:43:14 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-27 01:21:52 +0530 |
| commit | f64e1467ad0549702ef90801fc020298a32e2566 (patch) | |
| tree | c55980141a37ec09a160c28afe928f8ae6575fa0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
| parent | e9eb5a6fd75b9bab1f341227e7bdb566aa163bcd (diff) | |
| download | open-keychain-f64e1467ad0549702ef90801fc020298a32e2566.tar.gz open-keychain-f64e1467ad0549702ef90801fc020298a32e2566.tar.bz2 open-keychain-f64e1467ad0549702ef90801fc020298a32e2566.zip | |
split import and export ops
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 5fbc7f6c7..590c58f97 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -32,7 +32,7 @@ import org.spongycastle.bcpg.CompressionAlgorithmTags; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; -import org.sufficientlysecure.keychain.operations.ImportExportOperation; +import org.sufficientlysecure.keychain.operations.ImportOperation; import org.sufficientlysecure.keychain.operations.results.ConsolidateResult; import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType; @@ -1248,7 +1248,7 @@ public class ProviderHelper { // 3. Re-Import secret keyrings from cache if (numSecrets > 0) { - ImportKeyResult result = new ImportExportOperation(mContext, this, + ImportKeyResult result = new ImportOperation(mContext, this, new ProgressFixedScaler(progress, 10, 25, 100, R.string.progress_con_reimport)) .serialKeyRingImport(itSecrets, numSecrets, null); log.add(result, indent); @@ -1276,7 +1276,7 @@ public class ProviderHelper { // 4. Re-Import public keyrings from cache if (numPublics > 0) { - ImportKeyResult result = new ImportExportOperation(mContext, this, + ImportKeyResult result = new ImportOperation(mContext, this, new ProgressFixedScaler(progress, 25, 99, 100, R.string.progress_con_reimport)) .serialKeyRingImport(itPublics, numPublics, null); log.add(result, indent); |