From 7d7351463de98f67551b45af4c4ab4fd61be62c9 Mon Sep 17 00:00:00 2001 From: OliE Date: Sat, 6 Jan 2018 11:43:52 +0100 Subject: [PATCH] upgrade version number to 1.7 beta --- android_app/app/build.gradle | 4 ++-- .../java/com/health/openscale/core/OpenScale.java | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index d9a2a7a9..07c340f5 100644 --- a/android_app/app/build.gradle +++ b/android_app/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.health.openscale" minSdkVersion 18 targetSdkVersion 22 // don't set target sdk > 22 otherwise bluetooth le discovery need permission to ACCESS_COARSE_LOCATION - versionCode 21 - versionName "1.6.1" + versionCode 22 + versionName "1.7 (beta)" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation":"$projectDir/schemas".toString()] } 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 be55a964..c3530c1d 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 @@ -97,16 +97,18 @@ public class OpenScale { } private void migrateSQLtoRoom() { - List scaleUserList = scaleUserDB.getScaleUserList(); + List oldScaleUserList = scaleUserDB.getScaleUserList(); - if (scaleDB.getReadableDatabase().getVersion() == 6 && userDAO.getAll().isEmpty() && !scaleUserList.isEmpty()) { + if (scaleDB.getReadableDatabase().getVersion() == 6 && userDAO.getAll().isEmpty() && !oldScaleUserList.isEmpty()) { Toast.makeText(context, "Migrating old SQL database to new database format...", Toast.LENGTH_LONG).show(); - userDAO.insertAll(scaleUserList); + userDAO.insertAll(oldScaleUserList); - for (ScaleUser user : scaleUserList) { - List scaleMeasurementList = scaleDB.getScaleDataList(user.getId()); - measurementDAO.insertAll(scaleMeasurementList); + for (ScaleUser user : oldScaleUserList) { + List oldScaleMeasurementList = scaleDB.getScaleDataList(user.getId()); + measurementDAO.insertAll(oldScaleMeasurementList); } + + Toast.makeText(context, "Finished migrating old SQL database to new database format", Toast.LENGTH_LONG).show(); } }