aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/SignEncryptOperation.java
diff options
context:
space:
mode:
authorManoj Khanna <manojkhannakm@gmail.com>2015-03-13 00:53:05 +0530
committerManoj Khanna <manojkhannakm@gmail.com>2015-03-13 00:53:05 +0530
commit5b5e5b498101dd9d9dcc7285e586f394d5dd546c (patch)
tree7aeb55b49b899734ac47eeed0b2a28c75aa6a719 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/SignEncryptOperation.java
parentb953623802a5446a0e86b37d35afda623c316d4c (diff)
downloadopen-keychain-5b5e5b498101dd9d9dcc7285e586f394d5dd546c.tar.gz
open-keychain-5b5e5b498101dd9d9dcc7285e586f394d5dd546c.tar.bz2
open-keychain-5b5e5b498101dd9d9dcc7285e586f394d5dd546c.zip
Fix for Issue #1115
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/SignEncryptOperation.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/SignEncryptOperation.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/SignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/SignEncryptOperation.java
index e98f6b150..af60ea5ee 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/SignEncryptOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/SignEncryptOperation.java
@@ -48,6 +48,7 @@ public class SignEncryptOperation extends BaseOperation {
byte[] inputBytes = input.getBytes();
byte[] outputBytes = null;
+ int total = inputBytes != null ? 1 : inputUris.size(), count = 0;
ArrayList<PgpSignEncryptResult> results = new ArrayList<>();
do {
@@ -104,7 +105,7 @@ public class SignEncryptOperation extends BaseOperation {
}
PgpSignEncryptOperation op = new PgpSignEncryptOperation(mContext, mProviderHelper,
- new ProgressScaler(), mCancelled);
+ new ProgressScaler(mProgressable, 100 * count / total, 100 * ++count / total, 100), mCancelled);
PgpSignEncryptResult result = op.execute(input, inputData, outStream);
results.add(result);
log.add(result, 2);