summaryrefslogtreecommitdiffstats
path: root/WallpaperPicker
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2014-01-06 14:33:50 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:24 -0700
commit444ea259bc407c561e9ac69f7584fd7f505c199a (patch)
treed7a329ed4b1f5b777902e76bf59b338c52a4adeb /WallpaperPicker
parent1965e9e525615ee93d1bd3d55288baf33bb283a9 (diff)
downloadandroid_packages_apps_Trebuchet-444ea259bc407c561e9ac69f7584fd7f505c199a.zip
android_packages_apps_Trebuchet-444ea259bc407c561e9ac69f7584fd7f505c199a.tar.gz
android_packages_apps_Trebuchet-444ea259bc407c561e9ac69f7584fd7f505c199a.tar.bz2
Move saved wallpaper images from cache directory to data directory
Bug: 12028275 Change-Id: Ia8fdd0ea50a4dad34e560287c50ae3fcc6d09cf9
Diffstat (limited to 'WallpaperPicker')
-rw-r--r--WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
index 58add70..44bfdf1 100644
--- a/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
+++ b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
@@ -85,6 +85,9 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter {
}
public SavedWallpaperImages(Activity context) {
+ // We used to store the saved images in the cache directory, but that meant they'd get
+ // deleted sometimes-- move them to the data directory
+ ImageDb.moveFromCacheDirectoryIfNecessary(context);
mDb = new ImageDb(context);
mContext = context;
mLayoutInflater = context.getLayoutInflater();
@@ -215,11 +218,20 @@ public class SavedWallpaperImages extends BaseAdapter implements ListAdapter {
Context mContext;
public ImageDb(Context context) {
- super(context, new File(context.getCacheDir(), DB_NAME).getPath(), null, DB_VERSION);
+ super(context, context.getDatabasePath(DB_NAME).getPath(), null, DB_VERSION);
// Store the context for later use
mContext = context;
}
+ public static void moveFromCacheDirectoryIfNecessary(Context context) {
+ // We used to store the saved images in the cache directory, but that meant they'd get
+ // deleted sometimes-- move them to the data directory
+ File oldSavedImagesFile = new File(context.getCacheDir(), ImageDb.DB_NAME);
+ File savedImagesFile = context.getDatabasePath(ImageDb.DB_NAME);
+ if (oldSavedImagesFile.exists()) {
+ oldSavedImagesFile.renameTo(savedImagesFile);
+ }
+ }
@Override
public void onCreate(SQLiteDatabase database) {
database.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " (" +