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/PgpDecryptVerify.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/PgpDecryptVerify.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index 0d005a4ef..71900d002 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -52,12 +52,12 @@ import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.pgp.Progressable; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.Log; -import org.sufficientlysecure.keychain.util.ProgressDialogUpdater; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -79,7 +79,7 @@ public class PgpDecryptVerify { private InputData mData; private OutputStream mOutStream; - private ProgressDialogUpdater mProgressDialogUpdater; + private Progressable mProgressable; private boolean mAllowSymmetricDecryption; private String mPassphrase; private Set<Long> mAllowedKeyIds; @@ -91,7 +91,7 @@ public class PgpDecryptVerify { this.mData = builder.mData; this.mOutStream = builder.mOutStream; - this.mProgressDialogUpdater = builder.mProgressDialogUpdater; + this.mProgressable = builder.mProgressable; this.mAllowSymmetricDecryption = builder.mAllowSymmetricDecryption; this.mPassphrase = builder.mPassphrase; this.mAllowedKeyIds = builder.mAllowedKeyIds; @@ -105,7 +105,7 @@ public class PgpDecryptVerify { private OutputStream mOutStream; // optional - private ProgressDialogUpdater mProgressDialogUpdater = null; + private Progressable mProgressable = null; private boolean mAllowSymmetricDecryption = true; private String mPassphrase = null; private Set<Long> mAllowedKeyIds = null; @@ -118,8 +118,8 @@ public class PgpDecryptVerify { this.mOutStream = outStream; } - public Builder progressDialogUpdater(ProgressDialogUpdater progressDialogUpdater) { - this.mProgressDialogUpdater = progressDialogUpdater; + public Builder progressable(Progressable progressable) { + this.mProgressable = progressable; return this; } @@ -151,14 +151,14 @@ public class PgpDecryptVerify { } public void updateProgress(int message, int current, int total) { - if (mProgressDialogUpdater != null) { - mProgressDialogUpdater.setProgress(message, current, total); + if (mProgressable != null) { + mProgressable.setProgress(message, current, total); } } public void updateProgress(int current, int total) { - if (mProgressDialogUpdater != null) { - mProgressDialogUpdater.setProgress(current, total); + if (mProgressable != null) { + mProgressable.setProgress(current, total); } } |