aboutsummaryrefslogtreecommitdiffstats
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/org/connectbot/util/HostDatabase.java22
1 files changed, 19 insertions, 3 deletions
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