PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move saved wallpaper images from cache directory to data directory" into jb-ub-now-kermit

Browse Source
This commit is contained in:
Michael Jurka
2014-01-14 11:10:48 +00:00
committed by Android (Google) Code Review
parent 574120cdca 8b51b17320
commit fe45a82ed9
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
+13 -1
View File
@@ -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 + " (" +