OI Safe: Clean up code.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2054 72b678ce-9140-0410-bee8-679b907dd61a

diff --git a/src/org/openintents/safe/CryptoHelper.java b/src/org/openintents/safe/CryptoHelper.java
index 36b4ef5bec34ac182d787b63dfd6e2ed9b4957b4..aae113152f58346b53aa1d30cc2e227992ed267e 100644 (file)
--- a/src/org/openintents/safe/CryptoHelper.java
+++ b/src/org/openintents/safe/CryptoHelper.java
@@ -762,14 +762,15 @@ public class CryptoHelper {
        Log.d(TAG, "fileUri="+fileUri.toString());\r
        ContentResolver contentResolver = ctx.getContentResolver();\r
 \r
+       String inputPath = null;\r
                String outputPath = null;\r
                Uri resultUri = null;\r
        boolean result = false;\r
        \r
        try {\r
                InputStream is;\r
-                       if (fileUri.getScheme().equals("file")) {\r
-                               String inputPath = fileUri.getPath();\r
+               if (fileUri.getScheme().equals("file")) {\r
+                               inputPath = fileUri.getPath();\r
                                is = new java.io.FileInputStream(inputPath);\r
                                if (debug) Log.d(TAG, "Decrypt: Input from " + inputPath);\r
                                if (inputPath.endsWith(OISAFE_EXTENSION)) {\r
@@ -807,8 +808,9 @@ public class CryptoHelper {
                        // Successful\r
 \r
                        // Securely delete the original file:\r
-                       \r
-                       SecureDelete.delete(new File(fileUri.getPath()));\r
+                       if (inputPath != null) {\r
+                               SecureDelete.delete(new File(inputPath));\r
+                       }\r
                } else {\r
                        resultUri = null;\r
                        \r
@@ -887,12 +889,6 @@ public class CryptoHelper {
                        Log.e(TAG, "IOException", e);\r
                }\r
 \r
-               // Securely delete the original file:\r
-               \r
-               // TODO Peli: Only delete if this is not a decryption through ContentProvider.\r
-               // SecureDelete.delete(new File(fileUri.getPath()));\r
-\r
-\r
                if (result == false) {\r
                        resultUri = null;\r
                        \r