From 4722ecb9557ff9659cf5f6319139624bc64a5da5 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 16 Sep 2015 20:36:19 +0200 Subject: actually use cleaned text if we read from clipboard --- .../java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 4f3f6cc6e..043929130 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -181,9 +181,13 @@ public class DecryptActivity extends BaseActivity { } - @Nullable public Uri readToTempFile(String text) throws IOException { + @Nullable + public Uri readToTempFile(String text) throws IOException { Uri tempFile = TemporaryStorageProvider.createFile(this); OutputStream outStream = getContentResolver().openOutputStream(tempFile); + if (outStream == null) { + return null; + } // clean up ascii armored message, fixing newlines and stuff String cleanedText = PgpHelper.getPgpContent(text); @@ -192,7 +196,7 @@ public class DecryptActivity extends BaseActivity { } // if cleanup didn't work, just try the raw data - outStream.write(text.getBytes()); + outStream.write(cleanedText.getBytes()); outStream.close(); return tempFile; } -- cgit v1.2.3