From c2ce0e15e18059607b29c62f9b9121ca952348f1 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sun, 25 Mar 2018 23:30:07 +0200 Subject: [PATCH] Don't create old databases in new installs --- .../src/main/java/com/health/openscale/core/OpenScale.java | 6 +++++- .../com/health/openscale/core/database/ScaleDatabase.java | 2 +- .../health/openscale/core/database/ScaleUserDatabase.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java index 82bca962..7541295d 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java @@ -126,7 +126,11 @@ public class OpenScale { } private void migrateSQLtoRoom() { - // TODO: check if databases exist before opening and possibly creating them + if (!context.getDatabasePath(ScaleUserDatabase.DATABASE_NAME).exists() + || !context.getDatabasePath(ScaleDatabase.DATABASE_NAME).exists()) { + return; + } + ScaleDatabase scaleDB = new ScaleDatabase(context); ScaleUserDatabase scaleUserDB = new ScaleUserDatabase(context); diff --git a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java index 4c78ff31..40e6ed16 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java +++ b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java @@ -32,7 +32,7 @@ import java.util.Locale; public class ScaleDatabase extends SQLiteOpenHelper { private static final int DATABASE_VERSION = 6; - private static final String DATABASE_NAME = "openScaleDatabase.db"; + public static final String DATABASE_NAME = "openScaleDatabase.db"; private static final String TABLE_NAME = "scaledata"; private static final String COLUMN_NAME_ID = "id"; diff --git a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java index 86ded30d..c1325e6d 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java +++ b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java @@ -32,7 +32,7 @@ import java.util.Locale; public class ScaleUserDatabase extends SQLiteOpenHelper { private static final int DATABASE_VERSION = 3; - private static final String DATABASE_NAME = "openScaleUserDatabase.db"; + public static final String DATABASE_NAME = "openScaleUserDatabase.db"; private static final String TABLE_NAME = "scaleuserdata"; private static final String COLUMN_NAME_ID = "id";