diff options
author | Thialfihar <thi@thialfihar.org> | 2014-04-29 18:44:44 +0200 |
---|---|---|
committer | Thialfihar <thi@thialfihar.org> | 2014-04-29 18:44:44 +0200 |
commit | 9e6bf2abbb1395798c7b6957b193d738940a2b57 (patch) | |
tree | ff2fac94cc8956954f21bc300041eb2858883cdd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | |
parent | 6a1832ebaddc37326d35e9e4514510a3691841c7 (diff) | |
download | open-keychain-9e6bf2abbb1395798c7b6957b193d738940a2b57.tar.gz open-keychain-9e6bf2abbb1395798c7b6957b193d738940a2b57.tar.bz2 open-keychain-9e6bf2abbb1395798c7b6957b193d738940a2b57.zip |
Rename ProgressDialogUpdater to Progressable
Also fix some inconsistent usages of "progress", now using
"progressable" in all builders.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java index 5b85d82a6..bfbcd582e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java @@ -32,6 +32,7 @@ import org.spongycastle.openpgp.PGPSecretKeyRing; import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.pgp.Progressable; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.service.KeychainIntentService; @@ -41,7 +42,6 @@ import org.sufficientlysecure.keychain.util.IterableIterator; import org.sufficientlysecure.keychain.util.KeyServer.AddKeyException; import org.sufficientlysecure.keychain.util.KeychainServiceListener; import org.sufficientlysecure.keychain.util.Log; -import org.sufficientlysecure.keychain.util.ProgressDialogUpdater; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -52,7 +52,7 @@ import java.util.List; public class PgpImportExport { private Context mContext; - private ProgressDialogUpdater mProgress; + private Progressable mProgressable; private KeychainServiceListener mKeychainServiceListener; @@ -63,37 +63,37 @@ public class PgpImportExport { public static final int RETURN_BAD = -2; public static final int RETURN_UPDATED = 1; - public PgpImportExport(Context context, ProgressDialogUpdater progress) { + public PgpImportExport(Context context, Progressable progressable) { super(); this.mContext = context; - this.mProgress = progress; + this.mProgressable = progressable; this.mProviderHelper = new ProviderHelper(context); } public PgpImportExport(Context context, - ProgressDialogUpdater progress, KeychainServiceListener keychainListener) { + Progressable progressable, KeychainServiceListener keychainListener) { super(); this.mContext = context; - this.mProgress = progress; + this.mProgressable = progressable; this.mProviderHelper = new ProviderHelper(context); this.mKeychainServiceListener = keychainListener; } public void updateProgress(int message, int current, int total) { - if (mProgress != null) { - mProgress.setProgress(message, current, total); + if (mProgressable != null) { + mProgressable.setProgress(message, current, total); } } public void updateProgress(String message, int current, int total) { - if (mProgress != null) { - mProgress.setProgress(message, current, total); + if (mProgressable != null) { + mProgressable.setProgress(message, current, total); } } public void updateProgress(int current, int total) { - if (mProgress != null) { - mProgress.setProgress(current, total); + if (mProgressable != null) { + mProgressable.setProgress(current, total); } } |