aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-07-31 20:59:40 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-07-31 20:59:50 +0200
commit58c2ca6eb814fa5384a7342b249fdb48b52af07d (patch)
tree14adb57854a5b76e6e41002042ba5a2c38c5743e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
parent7bbe869c88c445b087e32a75572cf18efa2165b6 (diff)
downloadopen-keychain-58c2ca6eb814fa5384a7342b249fdb48b52af07d.tar.gz
open-keychain-58c2ca6eb814fa5384a7342b249fdb48b52af07d.tar.bz2
open-keychain-58c2ca6eb814fa5384a7342b249fdb48b52af07d.zip
completely overengineer progress indication in {modify,create}SecretKeyRing methods
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.java4
1 files changed, 2 insertions, 2 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 869eea03f..95a259336 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java
@@ -46,13 +46,13 @@ public class ProgressScaler implements Progressable {
public void setProgress(int resourceId, int progress, int max) {
if (mWrapped != null) {
- mWrapped.setProgress(resourceId, progress, mMax);
+ mWrapped.setProgress(resourceId, mFrom + progress * (mTo - mFrom) / max, mMax);
}
}
public void setProgress(int progress, int max) {
if (mWrapped != null) {
- mWrapped.setProgress(progress, max);
+ mWrapped.setProgress(mFrom + progress * (mTo - mFrom) / max, mMax);
}
}