actually use cleaned text if we read from clipboard

This commit is contained in:
Vincent Breitmoser
2015-09-16 20:36:19 +02:00
parent 93421e902c
commit 4722ecb955

View File

@@ -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;
}