From a2048773ee194168594c52c4ea6472b211ef0d5e Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Sun, 23 Mar 2014 19:37:41 +0100
Subject: Fix file decryption interface

Actually use mAssumeSymmetricEncryption and set it to false as
default. Don't close the file input stream, so we can actually
look for PGP encrypted data in the next step.
---
 .../org/sufficientlysecure/keychain/ui/DecryptActivity.java | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/java/org')

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index 3e389c034..ed9735d8c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -443,8 +443,7 @@ public class DecryptActivity extends DrawerActivity {
         getDecryptionKeyFromInputStream();
 
         // if we need a symmetric passphrase or a passphrase to use a secret key ask for it
-        if (mSecretKeyId == Id.key.symmetric
-                || PassphraseCacheService.getCachedPassphrase(this, mSecretKeyId) == null) {
+        if (mAssumeSymmetricEncryption || PassphraseCacheService.getCachedPassphrase(this, mSecretKeyId) == null) {
             showPassphraseDialog();
         } else {
             if (mDecryptTarget == Id.target.file) {
@@ -494,6 +493,7 @@ public class DecryptActivity extends DrawerActivity {
      * TODO: Rework function, remove global variables
      */
     private void getDecryptionKeyFromInputStream() {
+        mAssumeSymmetricEncryption = false;
         InputStream inStream = null;
         if (mContentUri != null) {
             try {
@@ -517,13 +517,6 @@ public class DecryptActivity extends DrawerActivity {
                 Log.e(Constants.TAG, "File not found!", e);
                 AppMsg.makeText(this, getString(R.string.error_file_not_found, e.getMessage()),
                         AppMsg.STYLE_ALERT).show();
-            } finally {
-                try {
-                    if (inStream != null) {
-                        inStream.close();
-                    }
-                } catch (Exception e) {
-                }
             }
         } else {
             inStream = new ByteArrayInputStream(mMessage.getText().toString().getBytes());
@@ -540,7 +533,6 @@ public class DecryptActivity extends DrawerActivity {
                 if (mSecretKeyId == Id.key.none) {
                     throw new PgpGeneralException(getString(R.string.error_no_secret_key_found));
                 }
-                mAssumeSymmetricEncryption = false;
             } catch (NoAsymmetricEncryptionException e) {
                 if (inStream.markSupported()) {
                     inStream.reset();
@@ -553,6 +545,7 @@ public class DecryptActivity extends DrawerActivity {
                 mAssumeSymmetricEncryption = true;
             }
         } catch (Exception e) {
+            Log.e(Constants.TAG, "error while reading decryption key from input stream", e);
             AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()),
                     AppMsg.STYLE_ALERT).show();
         }
-- 
cgit v1.2.3