Change the thumbnail folder to internal storage.

The app did not check if .thumbnail folder is created because
it used to be created by gallery a long time ago. Thumbnails
would fail to be saved if .thumbnail did not exist.

bug:4483083
Change-Id: I03c345f35ab1880878457d2537bbff18c175899c

3 files changed, 12 insertions, 11 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index d4d2171..7dc3e82 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -424,7 +424,7 @@ public class Camera extends ActivityBase implements View.OnClickListener,
     private void initThumbnailButton() {
         mThumbnailButton.setOnClickListener(this);
         // Load the thumbnail from the disk.
-        mThumbnail = Thumbnail.loadFrom(LAST_THUMB_FILENAME);
+        mThumbnail = Thumbnail.loadFrom(new File(getFilesDir(), LAST_THUMB_FILENAME));
         updateThumbnailButton();
     }
 
@@ -1497,7 +1497,9 @@ public class Camera extends ActivityBase implements View.OnClickListener,
         if (mFirstTimeInitialized) {
             mOrientationListener.disable();
             if (!mIsImageCaptureIntent) {
-                if (mThumbnail != null) mThumbnail.saveTo(LAST_THUMB_FILENAME);
+                if (mThumbnail != null) {
+                    mThumbnail.saveTo(new File(getFilesDir(), LAST_THUMB_FILENAME));
+                }
             }
             hidePostCaptureAlert();
         }
diff --git a/src/com/android/camera/Thumbnail.java b/src/com/android/camera/Thumbnail.java
index 510e6a3..4f95dc9 100644
--- a/src/com/android/camera/Thumbnail.java
+++ b/src/com/android/camera/Thumbnail.java
@@ -34,6 +34,7 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -41,7 +42,6 @@ import java.io.IOException;
 class Thumbnail {
     private static final String TAG = "Thumbnail";
 
-    private static final String DIRECTORY = Storage.DCIM + "/.thumbnails/";
     private static final int BUFSIZE = 4096;
 
     private Uri mUri;
@@ -80,20 +80,19 @@ class Thumbnail {
     }
 
     // Stores the bitmap to the specified file.
-    public void saveTo(String filename) {
-        String path = DIRECTORY + filename;
+    public void saveTo(File file) {
         FileOutputStream f = null;
         BufferedOutputStream b = null;
         DataOutputStream d = null;
         try {
-            f = new FileOutputStream(path);
+            f = new FileOutputStream(file);
             b = new BufferedOutputStream(f, BUFSIZE);
             d = new DataOutputStream(b);
             d.writeUTF(mUri.toString());
             mBitmap.compress(Bitmap.CompressFormat.PNG, 100, d);
             d.close();
         } catch (IOException e) {
-            Log.e(TAG, "Fail to store bitmap. path=" + path, e);
+            Log.e(TAG, "Fail to store bitmap. path=" + file.getPath(), e);
         } finally {
             Util.closeSilently(f);
             Util.closeSilently(b);
@@ -104,14 +103,14 @@ class Thumbnail {
 
     // Loads the data from the specified file.
     // Returns null if failure.
-    public static Thumbnail loadFrom(String filename) {
+    public static Thumbnail loadFrom(File file) {
         Uri uri = null;
         Bitmap bitmap = null;
         FileInputStream f = null;
         BufferedInputStream b = null;
         DataInputStream d = null;
         try {
-            f = new FileInputStream(DIRECTORY + filename);
+            f = new FileInputStream(file);
             b = new BufferedInputStream(f, BUFSIZE);
             d = new DataInputStream(b);
             uri = Uri.parse(d.readUTF());
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 02ca25c..95afba6 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -969,7 +969,7 @@ public class VideoCamera extends ActivityBase
         resetScreenOn();
 
         if (!mIsVideoCaptureIntent && mThumbnail != null) {
-            mThumbnail.saveTo(LAST_THUMB_FILENAME);
+            mThumbnail.saveTo(new File(getFilesDir(), LAST_THUMB_FILENAME));
         }
 
         if (mStorageHint != null) {
@@ -1600,7 +1600,7 @@ public class VideoCamera extends ActivityBase
         mThumbnailButton = (RotateImageView) findViewById(R.id.review_thumbnail);
         mThumbnailButton.setOnClickListener(this);
         // Load the thumbnail from the disk.
-        mThumbnail = Thumbnail.loadFrom(LAST_THUMB_FILENAME);
+        mThumbnail = Thumbnail.loadFrom(new File(getFilesDir(), LAST_THUMB_FILENAME));
     }
 
     private void updateThumbnailButton() {