moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 with db upgrade

This commit is contained in:
Dominik Schürmann 2015-05-04 13:57:43 +02:00
parent 02e86c90b6
commit 4e425495e6
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java
View File

@ -31,10 +31,12 @@ import android.provider.OpenableColumns;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.util.DatabaseUtil; import org.sufficientlysecure.keychain.util.DatabaseUtil;
import org.sufficientlysecure.keychain.util.Log;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.util.UUID;
public class TemporaryStorageProvider extends ContentProvider { public class TemporaryStorageProvider extends ContentProvider {
@ -44,7 +46,7 @@ public class TemporaryStorageProvider extends ContentProvider {
private static final String COLUMN_NAME = "name"; private static final String COLUMN_NAME = "name";
private static final String COLUMN_TIME = "time"; private static final String COLUMN_TIME = "time";
private static final Uri BASE_URI = Uri.parse("content://org.sufficientlysecure.keychain.tempstorage/"); private static final Uri BASE_URI = Uri.parse("content://org.sufficientlysecure.keychain.tempstorage/");
private static final int DB_VERSION = 1; private static final int DB_VERSION = 2;
public static Uri createFile(Context context, String targetName) { public static Uri createFile(Context context, String targetName) {
ContentValues contentValues = new ContentValues(); ContentValues contentValues = new ContentValues();
@ -66,7 +68,7 @@ public class TemporaryStorageProvider extends ContentProvider {
@Override @Override
public void onCreate(SQLiteDatabase db) { public void onCreate(SQLiteDatabase db) {
db.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_FILES + " (" + db.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_FILES + " (" +
COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " + COLUMN_ID + " TEXT PRIMARY KEY, " +
COLUMN_NAME + " TEXT, " + COLUMN_NAME + " TEXT, " +
COLUMN_TIME + " INTEGER" + COLUMN_TIME + " INTEGER" +
");"); ");");
@ -74,7 +76,17 @@ public class TemporaryStorageProvider extends ContentProvider {
@Override @Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
Log.d(Constants.TAG, "Upgrading files db from " + oldVersion + " to " + newVersion);
switch (oldVersion) {
case 1:
db.execSQL("DROP TABLE IF EXISTS files");
db.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_FILES + " (" +
COLUMN_ID + " TEXT PRIMARY KEY, " +
COLUMN_NAME + " TEXT, " +
COLUMN_TIME + " INTEGER" +
");");
}
} }
} }
@ -82,13 +94,13 @@ public class TemporaryStorageProvider extends ContentProvider {
private File getFile(Uri uri) throws FileNotFoundException { private File getFile(Uri uri) throws FileNotFoundException {
try { try {
return getFile(Integer.parseInt(uri.getLastPathSegment())); return getFile(uri.getLastPathSegment());
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
throw new FileNotFoundException(); throw new FileNotFoundException();
} }
} }
private File getFile(int id) { private File getFile(String id) {
return new File(getContext().getCacheDir(), "temp/" + id); return new File(getContext().getCacheDir(), "temp/" + id);
} }
@ -133,13 +145,15 @@ public class TemporaryStorageProvider extends ContentProvider {
if (!values.containsKey(COLUMN_TIME)) { if (!values.containsKey(COLUMN_TIME)) {
values.put(COLUMN_TIME, System.currentTimeMillis()); values.put(COLUMN_TIME, System.currentTimeMillis());
} }
String uuid = UUID.randomUUID().toString();
values.put(COLUMN_ID, uuid);
int insert = (int) db.getWritableDatabase().insert(TABLE_FILES, null, values); int insert = (int) db.getWritableDatabase().insert(TABLE_FILES, null, values);
try { try {
getFile(insert).createNewFile(); getFile(uuid).createNewFile();
} catch (IOException e) { } catch (IOException e) {
return null; return null;
} }
return Uri.withAppendedPath(BASE_URI, Long.toString(insert)); return Uri.withAppendedPath(BASE_URI, uuid);
} }
@Override @Override
@ -152,7 +166,7 @@ public class TemporaryStorageProvider extends ContentProvider {
selectionArgs, null, null, null); selectionArgs, null, null, null);
if (files != null) { if (files != null) {
while (files.moveToNext()) { while (files.moveToNext()) {
getFile(files.getInt(0)).delete(); getFile(files.getString(0)).delete();
} }
files.close(); files.close();
return db.getWritableDatabase().delete(TABLE_FILES, selection, selectionArgs); return db.getWritableDatabase().delete(TABLE_FILES, selection, selectionArgs);