diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-20 03:34:21 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-20 03:34:21 +0200 |
commit | f6bc1dcca36cd6e5860a413e41ea7c9896c29137 (patch) | |
tree | 4c2ffdd7723314ac5725617defe4c82fc79319d5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | |
parent | 25beeaceb59f9d536d2d9408fba47f9fc3700627 (diff) | |
download | open-keychain-f6bc1dcca36cd6e5860a413e41ea7c9896c29137.tar.gz open-keychain-f6bc1dcca36cd6e5860a413e41ea7c9896c29137.tar.bz2 open-keychain-f6bc1dcca36cd6e5860a413e41ea7c9896c29137.zip |
extract readTextFromUri into FileHelper
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java index 65bcd022d..1199ebc27 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -18,11 +18,8 @@ package org.sufficientlysecure.keychain.ui; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -346,40 +343,14 @@ public class DecryptListFragment intent.putExtra(DisplayTextActivity.EXTRA_METADATA, result); intent.setDataAndType(outputUri, "text/plain"); + String plaintext; try { - - byte[] decryptedMessage; - { - InputStream in = activity.getContentResolver().openInputStream(outputUri); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - byte[] buf = new byte[256]; - int read; - while ( (read = in.read(buf)) > 0) { - out.write(buf, 0, read); - } - in.close(); - out.close(); - decryptedMessage = out.toByteArray(); - } - - String plaintext; - if (result.getCharset() != null) { - try { - plaintext = new String(decryptedMessage, result.getCharset()); - } catch (UnsupportedEncodingException e) { - // if we can't decode properly, just fall back to utf-8 - plaintext = new String(decryptedMessage); - } - } else { - plaintext = new String(decryptedMessage); - } - - intent.putExtra(Intent.EXTRA_TEXT, plaintext); - + plaintext = FileHelper.readTextFromUri(activity, outputUri, result.getCharset()); } catch (IOException e) { Notify.create(activity, R.string.error_preparing_data, Style.ERROR).show(); return null; } + intent.putExtra(Intent.EXTRA_TEXT, plaintext); return intent; } |