aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-16 19:33:43 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-16 19:52:26 +0200
commitece06b1933c26688d2eb6b7fa8657acbb8833728 (patch)
tree426b596e7a5e6748ac027d540a8780b96c2bcc57 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
parent9ac7b33a4e15aea3f685a1713142aafcf1895195 (diff)
downloadopen-keychain-ece06b1933c26688d2eb6b7fa8657acbb8833728.tar.gz
open-keychain-ece06b1933c26688d2eb6b7fa8657acbb8833728.tar.bz2
open-keychain-ece06b1933c26688d2eb6b7fa8657acbb8833728.zip
multidecrypt: use bottom sheet for longclick options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
index 14f711df0..a5208e05b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
@@ -156,7 +156,6 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
if (mFilename != null) {
log.add(LogType.MSG_DATA_MIME_FILENAME, 3, mFilename);
}
- log.add(LogType.MSG_DATA_MIME_LENGTH, 3, bd.getContentLength());
Uri uri = TemporaryStorageProvider.createFile(mContext, mFilename, bd.getMimeType());
OutputStream out = mContext.getContentResolver().openOutputStream(uri, "w");
@@ -165,12 +164,15 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
throw new IOException("Error getting file for writing!");
}
- int len;
+ int len, totalLength = 0;
while ((len = is.read(buf)) > 0) {
+ totalLength += len;
out.write(buf, 0, len);
}
- OpenPgpMetadata metadata = new OpenPgpMetadata(mFilename, bd.getMimeType(), 0L, bd.getContentLength());
+ log.add(LogType.MSG_DATA_MIME_LENGTH, 3, totalLength);
+
+ OpenPgpMetadata metadata = new OpenPgpMetadata(mFilename, bd.getMimeType(), 0L, totalLength);
out.close();
outputUris.add(uri);