diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-12 02:02:37 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-12 02:02:37 +0200 |
commit | f82093c666a443cda0985a017f907b6c25977565 (patch) | |
tree | 38fc7e4e19463d832cf8090562430ee8232c2fba /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java | |
parent | ed0aec57bf4fe67768873401937462ffe6b2a130 (diff) | |
download | open-keychain-f82093c666a443cda0985a017f907b6c25977565.tar.gz open-keychain-f82093c666a443cda0985a017f907b6c25977565.tar.bz2 open-keychain-f82093c666a443cda0985a017f907b6c25977565.zip |
modifyKey: error out on integrity check fails
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java index 5553ea5d2..869eea03f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java @@ -39,15 +39,21 @@ public class ProgressScaler implements Progressable { * Set progress of ProgressDialog by sending message to handler on UI thread */ public void setProgress(String message, int progress, int max) { - mWrapped.setProgress(message, mFrom + progress * (mTo - mFrom) / max, mMax); + if (mWrapped != null) { + mWrapped.setProgress(message, mFrom + progress * (mTo - mFrom) / max, mMax); + } } public void setProgress(int resourceId, int progress, int max) { - mWrapped.setProgress(resourceId, progress, mMax); + if (mWrapped != null) { + mWrapped.setProgress(resourceId, progress, mMax); + } } public void setProgress(int progress, int max) { - mWrapped.setProgress(progress, max); + if (mWrapped != null) { + mWrapped.setProgress(progress, max); + } } } |