Issue 126: make sure files are deleted after done

git-svn-id: http://zxing.googlecode.com/svn/trunk@826 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/rim/src/com/google/zxing/client/rim/ZXingLMMainScreen.java b/rim/src/com/google/zxing/client/rim/ZXingLMMainScreen.java
index 1e8a2f5..7c59ac2 100644 (file)
--- a/rim/src/com/google/zxing/client/rim/ZXingLMMainScreen.java
+++ b/rim/src/com/google/zxing/client/rim/ZXingLMMainScreen.java
@@ -220,18 +220,19 @@ final class ZXingLMMainScreen extends MainScreen {
         showMessage("An error occured processing the image.");\r
         return;\r
       } finally {\r
-        if (is != null) {\r
-          try {\r
+        try {\r
+          if (is != null) {\r
             is.close();\r
-          } catch (IOException ioe) {\r
           }\r
-        }\r
-        if (file != null && file.exists()) {\r
-          if (file.isOpen()) {\r
-            //file.close();\r
+          if (file != null && file.exists()) {\r
+            if (file.isOpen()) {\r
+              file.close();\r
+            }\r
+            file.delete();\r
+            Log.info("Deleted image file.");\r
           }\r
-          //file.delete();\r
-          Log.info("Deleted image file.");\r
+        } catch (IOException ioe) {\r
+          Log.error("Error while closing file: " + ioe);\r
         }\r
       }\r
 \r