mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-24 09:13:04 +02:00
Code Issues Releases Wiki Activity

Close old database after migration is done

Browse Source
This commit is contained in:
Erik Johansson
2018-01-24 22:05:25 +01:00
parent d2d7295a1a
commit 0ee227259d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -65,8 +65,6 @@ public class OpenScale {
private AppDatabase appDB; private AppDatabase appDB;
private ScaleMeasurementDAO measurementDAO; private ScaleMeasurementDAO measurementDAO;
private ScaleUserDAO userDAO; private ScaleUserDAO userDAO;
private ScaleDatabase scaleDB;
private ScaleUserDatabase scaleUserDB;
private List<ScaleMeasurement> scaleMeasurementList; private List<ScaleMeasurement> scaleMeasurementList;
private BluetoothCommunication btCom; private BluetoothCommunication btCom;
@@ -79,8 +77,6 @@ public class OpenScale {
private OpenScale(Context context) { private OpenScale(Context context) {
this.context = context; this.context = context;
scaleDB = new ScaleDatabase(context);
scaleUserDB = new ScaleUserDatabase(context);
alarmHandler = new AlarmHandler(); alarmHandler = new AlarmHandler();
btCom = null; btCom = null;
fragmentList = new ArrayList<>(); fragmentList = new ArrayList<>();
@@ -120,6 +116,10 @@ public class OpenScale {
} }
private void migrateSQLtoRoom() { private void migrateSQLtoRoom() {
// TODO: check if databases exist before opening and possibly creating them
ScaleDatabase scaleDB = new ScaleDatabase(context);
ScaleUserDatabase scaleUserDB = new ScaleUserDatabase(context);
List<ScaleUser> oldScaleUserList = scaleUserDB.getScaleUserList(); List<ScaleUser> oldScaleUserList = scaleUserDB.getScaleUserList();
if (scaleDB.getReadableDatabase().getVersion() == 6 && userDAO.getAll().isEmpty() && !oldScaleUserList.isEmpty()) { if (scaleDB.getReadableDatabase().getVersion() == 6 && userDAO.getAll().isEmpty() && !oldScaleUserList.isEmpty()) {
@@ -133,6 +133,9 @@ public class OpenScale {
Toast.makeText(context, "Finished migrating old SQL database to new database format", Toast.LENGTH_LONG).show(); Toast.makeText(context, "Finished migrating old SQL database to new database format", Toast.LENGTH_LONG).show();
} }
scaleUserDB.close();
scaleDB.close();
} }
public void addScaleUser(final ScaleUser user) public void addScaleUser(final ScaleUser user)