From bba1bc399b61459da118b1f6f286ad4164feb89a Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 11 Sep 2015 10:55:11 -0700 Subject: Add back table reset for testing This seems to be more reliable than other methods. --- .../java/org/connectbot/util/HostDatabase.java | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/org/connectbot/util/HostDatabase.java b/app/src/main/java/org/connectbot/util/HostDatabase.java index 83fc6be..7c52f79 100644 --- a/app/src/main/java/org/connectbot/util/HostDatabase.java +++ b/app/src/main/java/org/connectbot/util/HostDatabase.java @@ -227,12 +227,28 @@ public class HostDatabase extends RobustSQLiteOpenHelper { } @VisibleForTesting - public static void resetInMemoryInstance(Context context) { - synchronized (sInstanceLock) { - sInstance = new HostDatabase(context, null); + public void resetDatabase() { + try { + mDb.beginTransaction(); + + mDb.execSQL("DROP TABLE IF EXISTS " + TABLE_HOSTS); + mDb.execSQL("DROP TABLE IF EXISTS " + TABLE_PORTFORWARDS); + mDb.execSQL("DROP TABLE IF EXISTS " + TABLE_COLORS); + mDb.execSQL("DROP TABLE IF EXISTS " + TABLE_COLOR_DEFAULTS); + + createTables(mDb); + + mDb.setTransactionSuccessful(); + } finally { + mDb.endTransaction(); } } + @VisibleForTesting + public static void resetInMemoryInstance(Context context) { + get(context).resetDatabase(); + } + @Override public void onRobustUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) throws SQLiteException { // Versions of the database before the Android Market release will be -- cgit v1.2.3