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

Merge pull request #161 from erijo/database

Browse Source 
Database upgrade and cleanup
This commit is contained in:
OliE
2018-01-26 16:54:05 +01:00
committed by GitHub
parent 360ce7f172 dd2944f83d
commit dd8172b2f6
21 changed files with 497 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
android_app/app/schemas/com.health.openscale.core.database.AppDatabase/2.json Normal file
View File

@@ -0,0 +1,195 @@
{
"formatVersion": 1,
"database": {
"version": 2,
"identityHash": "166a2a83c723c4117edaf1d107ac5194",
"entities": [
{
"tableName": "scaleMeasurements",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` INTEGER NOT NULL, `enabled` INTEGER NOT NULL, `datetime` INTEGER, `weight` REAL NOT NULL, `fat` REAL NOT NULL, `water` REAL NOT NULL, `muscle` REAL NOT NULL, `lbw` REAL NOT NULL, `waist` REAL NOT NULL, `hip` REAL NOT NULL, `bone` REAL NOT NULL, `comment` TEXT, FOREIGN KEY(`userId`) REFERENCES `scaleUsers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "userId",
"columnName": "userId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "enabled",
"columnName": "enabled",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "dateTime",
"columnName": "datetime",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "weight",
"columnName": "weight",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "fat",
"columnName": "fat",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "water",
"columnName": "water",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "muscle",
"columnName": "muscle",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "lbw",
"columnName": "lbw",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "waist",
"columnName": "waist",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "hip",
"columnName": "hip",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "bone",
"columnName": "bone",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "comment",
"columnName": "comment",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": true
},
"indices": [
{
"name": "index_scaleMeasurements_datetime_userId",
"unique": true,
"columnNames": [
"datetime",
"userId"
],
"createSql": "CREATE UNIQUE INDEX `index_scaleMeasurements_datetime_userId` ON `${TABLE_NAME}` (`datetime`, `userId`)"
}
],
"foreignKeys": [
{
"table": "scaleUsers",
"onDelete": "CASCADE",
"onUpdate": "NO ACTION",
"columns": [
"userId"
],
"referencedColumns": [
"id"
]
}
]
},
{
"tableName": "scaleUsers",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `username` TEXT, `birthday` INTEGER, `bodyHeight` INTEGER NOT NULL, `scaleUnit` INTEGER NOT NULL, `gender` INTEGER NOT NULL, `initialWeight` REAL NOT NULL, `goalWeight` REAL NOT NULL, `goalDate` INTEGER)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "userName",
"columnName": "username",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "birthday",
"columnName": "birthday",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "bodyHeight",
"columnName": "bodyHeight",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "scaleUnit",
"columnName": "scaleUnit",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "gender",
"columnName": "gender",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "initialWeight",
"columnName": "initialWeight",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "goalWeight",
"columnName": "goalWeight",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "goalDate",
"columnName": "goalDate",
"affinity": "INTEGER",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
}
],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"166a2a83c723c4117edaf1d107ac5194\")"
]
}
}

110
android_app/app/src/androidTest/java/com/health/openscale/DatabaseMigrationTest.java Normal file
View File

@@ -0,0 +1,110 @@
/* Copyright (C) 2018 Erik Johansson <erik@ejohansson.se>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package com.health.openscale;
import android.arch.persistence.db.SupportSQLiteDatabase;
import android.arch.persistence.db.SupportSQLiteOpenHelper;
import android.arch.persistence.db.framework.FrameworkSQLiteOpenHelperFactory;
import android.arch.persistence.room.testing.MigrationTestHelper;
import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import com.health.openscale.core.database.AppDatabase;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotSame;
import static junit.framework.Assert.assertTrue;
@RunWith(AndroidJUnit4.class)
public class DatabaseMigrationTest {
private static final String TEST_DB = "migration-test";
@Rule
public MigrationTestHelper helper;
public DatabaseMigrationTest() {
helper = new MigrationTestHelper(
InstrumentationRegistry.getInstrumentation(),
AppDatabase.class.getCanonicalName(),
new FrameworkSQLiteOpenHelperFactory());
}
@Test
public void migrate1To2() throws Exception {
SupportSQLiteDatabase db = helper.createDatabase(TEST_DB, 1);
ContentValues users = new ContentValues();
for (int i = 1; i < 4; ++i) {
users.put("id", i);
users.put("username", String.format("test%d", i));
users.put("bodyHeight", i * 50);
users.put("scaleUnit", 0);
users.put("gender", 0);
users.put("initialWeight", i * 25);
users.put("goalWeight", i * 20);
assertNotSame(-1, db.insert("scaleUsers", SQLiteDatabase.CONFLICT_ABORT, users));
}
ContentValues measurement = new ContentValues();
for (int i = 2; i < 5; ++i) {
for (int j = 0; j < 2; ++j) {
measurement.put("userId", i);
measurement.put("enabled", j);
measurement.put("comment", "a string");
for (String type : new String[]{"weight", "fat", "water", "muscle", "lbw", "waist", "hip", "bone"}) {
measurement.put(type, i * j);
}
assertNotSame(-1, db.insert("scaleMeasurements", SQLiteDatabase.CONFLICT_ABORT, measurement));
}
}
// Prepare for the next version.
db.close();
// Re-open the database with version 2 and provide MIGRATION_1_2 as the migration process.
db = helper.runMigrationsAndValidate(TEST_DB, 2, true, AppDatabase.MIGRATION_1_2);
// MigrationTestHelper automatically verifies the schema changes.
Cursor cursor = db.query("SELECT * FROM scaleMeasurements ORDER BY id, userId");
assertEquals(2 * 2, cursor.getCount());
cursor.moveToFirst();
for (int i = 2; i < 4; ++i) {
for (int j = 0; j < 2; ++j) {
assertEquals(i, cursor.getInt(cursor.getColumnIndex("userId")));
assertEquals(j, cursor.getInt(cursor.getColumnIndex("enabled")));
assertEquals("a string", cursor.getString(cursor.getColumnIndex("comment")));
for (String type : new String[]{"weight", "fat", "water", "muscle", "lbw", "waist", "hip", "bone"}) {
assertEquals((float) i * j, cursor.getFloat(cursor.getColumnIndex(type)));
}
cursor.moveToNext();
}
}
assertTrue(cursor.isAfterLast());
}
}

12
android_app/app/src/androidTest/java/com/health/openscale/DatabaseTest.java
View File

@@ -65,7 +65,7 @@ public class DatabaseTest {
@Test @Test
public void userOperations() throws Exception { public void userOperations() throws Exception {
ScaleUser user1 = new ScaleUser(); ScaleUser user1 = new ScaleUser();
ScaleUser user2 = new ScaleUser(); ScaleUser user2 = new ScaleUser();
user1.setUserName("foo"); user1.setUserName("foo");
user2.setUserName("bar"); user2.setUserName("bar");
@@ -121,8 +121,14 @@ public class DatabaseTest {
@Test @Test
public void measurementOperations() throws Exception { public void measurementOperations() throws Exception {
final ScaleUser scaleUser1 = new ScaleUser();
final ScaleUser scaleUser2 = new ScaleUser();
scaleUser1.setId((int)userDao.insert(scaleUser1));
scaleUser2.setId((int)userDao.insert(scaleUser2));
// User 1 data initialization // User 1 data initialization
final int user1 = 0; final int user1 = scaleUser1.getId();
ScaleMeasurement measurement11 = new ScaleMeasurement(); ScaleMeasurement measurement11 = new ScaleMeasurement();
ScaleMeasurement measurement12 = new ScaleMeasurement(); ScaleMeasurement measurement12 = new ScaleMeasurement();
ScaleMeasurement measurement13 = new ScaleMeasurement(); ScaleMeasurement measurement13 = new ScaleMeasurement();
@@ -140,7 +146,7 @@ public class DatabaseTest {
measurement13.setDateTime(new Date(300)); measurement13.setDateTime(new Date(300));
// User 2 data initialization // User 2 data initialization
final int user2 = 1; final int user2 = scaleUser2.getId();
ScaleMeasurement measurement21 = new ScaleMeasurement(); ScaleMeasurement measurement21 = new ScaleMeasurement();
ScaleMeasurement measurement22 = new ScaleMeasurement(); ScaleMeasurement measurement22 = new ScaleMeasurement();

31
android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java
View File

@@ -35,6 +35,7 @@ import com.health.openscale.core.OpenScale;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;
import com.health.openscale.core.utils.CsvHelper; import com.health.openscale.core.utils.CsvHelper;
import com.health.openscale.core.utils.DateTimeHelpers;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@@ -113,26 +114,22 @@ public class ScreenshotRecorder {
ScaleUser getTestUser() { ScaleUser getTestUser() {
ScaleUser user = new ScaleUser(); ScaleUser user = new ScaleUser();
user.setUserName("test"); user.setUserName("Test");
user.setBodyHeight(180); user.setBodyHeight(180);
user.setInitialWeight(80.0f); user.setInitialWeight(80.0f);
user.setGoalWeight(60.0f); user.setGoalWeight(60.0f);
Calendar birthday = Calendar.getInstance(); Calendar birthday = Calendar.getInstance();
birthday.setTimeInMillis(0); birthday.add(Calendar.YEAR, -28);
birthday.set(Calendar.YEAR, 1990); birthday.set(birthday.get(Calendar.YEAR), Calendar.JANUARY, 19, 0, 0, 0);
birthday.set(Calendar.MONTH, Calendar.JANUARY); birthday.set(Calendar.MILLISECOND, 0);
birthday.set(Calendar.DAY_OF_MONTH, 19);
birthday.set(Calendar.HOUR_OF_DAY, 0);
user.setBirthday(birthday.getTime()); user.setBirthday(birthday.getTime());
Calendar goalDate = Calendar.getInstance(); Calendar goalDate = Calendar.getInstance();
goalDate.setTimeInMillis(0); goalDate.add(Calendar.YEAR, 1);
goalDate.set(Calendar.YEAR, 2018); goalDate.set(goalDate.get(Calendar.YEAR), Calendar.JANUARY, 31, 0, 0, 0);
goalDate.set(Calendar.MONTH, Calendar.JANUARY); goalDate.set(Calendar.MILLISECOND, 0);
goalDate.set(Calendar.DAY_OF_MONTH, 31);
goalDate.set(Calendar.HOUR_OF_DAY, 0);
user.setGoalDate(goalDate.getTime()); user.setGoalDate(goalDate.getTime());
@@ -199,13 +196,16 @@ public class ScreenshotRecorder {
e.printStackTrace(); e.printStackTrace();
} }
// set current year to the measurement data // Move measurements forward in time
Calendar measurementDate = Calendar.getInstance(); Calendar measurementDate = Calendar.getInstance();
int year = measurementDate.get(Calendar.YEAR); if (!scaleMeasurementList.isEmpty()) {
measurementDate.setTime(scaleMeasurementList.get(0).getDateTime());
}
final int daysToAdvance = DateTimeHelpers.daysBetween(measurementDate, Calendar.getInstance());
for (ScaleMeasurement measurement : scaleMeasurementList) { for (ScaleMeasurement measurement : scaleMeasurementList) {
measurementDate.setTime(measurement.getDateTime()); measurementDate.setTime(measurement.getDateTime());
measurementDate.set(Calendar.YEAR, year); measurementDate.add(Calendar.DAY_OF_YEAR, daysToAdvance);
measurement.setDateTime(measurementDate.getTime()); measurement.setDateTime(measurementDate.getTime());
} }
@@ -213,7 +213,8 @@ public class ScreenshotRecorder {
} }
private void prepareData() { private void prepareData() {
openScale.addScaleUser(getTestUser()); int userId = openScale.addScaleUser(getTestUser());
openScale.selectScaleUser(userId);
List<ScaleMeasurement> scaleMeasurementList = getTestMeasurements(); List<ScaleMeasurement> scaleMeasurementList = getTestMeasurements();

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

@@ -16,11 +16,14 @@
package com.health.openscale.core; package com.health.openscale.core;
import android.arch.persistence.db.SupportSQLiteDatabase;
import android.arch.persistence.room.Room; import android.arch.persistence.room.Room;
import android.arch.persistence.room.RoomDatabase;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Handler; import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.util.Log; import android.util.Log;
@@ -48,7 +51,6 @@ import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
@@ -63,30 +65,25 @@ 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 ScaleUser selectedScaleUser;
private List<ScaleMeasurement> scaleMeasurementList; private List<ScaleMeasurement> scaleMeasurementList;
private BluetoothCommunication btCom; private BluetoothCommunication btCom;
private String btDeviceName; private String btDeviceName;
private AlarmHandler alarmHandler; private AlarmHandler alarmHandler;
private SimpleDateFormat dateTimeFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
private Context context; private Context context;
private ArrayList<FragmentUpdateListener> fragmentList; private ArrayList<FragmentUpdateListener> fragmentList;
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<>();
appDB = Room.databaseBuilder(context, AppDatabase.class, "openScale.db").allowMainThreadQueries().build();
measurementDAO = appDB.measurementDAO(); reopenDatabase();
userDAO = appDB.userDAO();
migrateSQLtoRoom(); migrateSQLtoRoom();
updateScaleData(); updateScaleData();
@@ -100,7 +97,31 @@ public class OpenScale {
return instance; return instance;
} }
public void reopenDatabase() {
if (appDB != null) {
appDB.close();
}
appDB = Room.databaseBuilder(context, AppDatabase.class, "openScale.db")
.allowMainThreadQueries()
.addCallback(new RoomDatabase.Callback() {
@Override
public void onOpen(@NonNull SupportSQLiteDatabase db) {
super.onOpen(db);
db.setForeignKeyConstraintsEnabled(true);
}
})
.addMigrations(AppDatabase.MIGRATION_1_2)
.build();
measurementDAO = appDB.measurementDAO();
userDAO = appDB.userDAO();
}
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()) {
@@ -114,54 +135,67 @@ 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 int addScaleUser(final ScaleUser user) {
{ return (int)userDAO.insert(user);
long userId = userDAO.insert(user); }
public void selectScaleUser(int userId) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
prefs.edit().putInt("selectedUserId", (int)userId).commit(); prefs.edit().putInt("selectedUserId", userId).commit();
selectedScaleUser = null;
} }
public List<ScaleUser> getScaleUserList() public int getSelectedScaleUserId() {
{ if (selectedScaleUser != null) {
return selectedScaleUser.getId();
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
return prefs.getInt("selectedUserId", -1);
}
public List<ScaleUser> getScaleUserList() {
return userDAO.getAll(); return userDAO.getAll();
} }
public ScaleUser getScaleUser(int userId) public ScaleUser getScaleUser(int userId) {
{ if (selectedScaleUser != null && selectedScaleUser.getId() == userId) {
return selectedScaleUser;
}
return userDAO.get(userId); return userDAO.get(userId);
} }
public ScaleUser getSelectedScaleUser() public ScaleUser getSelectedScaleUser() {
{ if (selectedScaleUser != null) {
ScaleUser scaleUser = new ScaleUser(); return selectedScaleUser;
}
try { try {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); final int selectedUserId = getSelectedScaleUserId();
int selectedUserId = prefs.getInt("selectedUserId", -1); if (selectedUserId != -1) {
selectedScaleUser = userDAO.get(selectedUserId);
if (selectedUserId == -1) { return selectedScaleUser;
return scaleUser;
} }
scaleUser = userDAO.get(selectedUserId);
} catch (Exception e) { } catch (Exception e) {
Toast.makeText(context, "Error: " + e.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Error: " + e.getMessage(), Toast.LENGTH_SHORT).show();
} }
return scaleUser; return new ScaleUser();
} }
public void deleteScaleUser(int id) public void deleteScaleUser(int id) {
{
userDAO.delete(userDAO.get(id)); userDAO.delete(userDAO.get(id));
selectedScaleUser = null;
} }
public void updateScaleUser(ScaleUser user) public void updateScaleUser(ScaleUser user) {
{
userDAO.update(user); userDAO.update(user);
selectedScaleUser = null;
} }
public List<ScaleMeasurement> getScaleMeasurementList() { public List<ScaleMeasurement> getScaleMeasurementList() {
@@ -333,8 +367,7 @@ public class OpenScale {
} }
public int[] getCountsOfMonth(int year) { public int[] getCountsOfMonth(int year) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int selectedUserId = getSelectedScaleUserId();
int selectedUserId = prefs.getInt("selectedUserId", -1);
int [] numOfMonth = new int[12]; int [] numOfMonth = new int[12];
@@ -353,8 +386,7 @@ public class OpenScale {
} }
public List<ScaleMeasurement> getScaleDataOfMonth(int year, int month) { public List<ScaleMeasurement> getScaleDataOfMonth(int year, int month) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int selectedUserId = getSelectedScaleUserId();
int selectedUserId = prefs.getInt("selectedUserId", -1);
Calendar startCalender = Calendar.getInstance(); Calendar startCalender = Calendar.getInstance();
Calendar endCalender = Calendar.getInstance(); Calendar endCalender = Calendar.getInstance();
@@ -367,8 +399,7 @@ public class OpenScale {
} }
public List<ScaleMeasurement> getScaleDataOfYear(int year) { public List<ScaleMeasurement> getScaleDataOfYear(int year) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int selectedUserId = getSelectedScaleUserId();
int selectedUserId = prefs.getInt("selectedUserId", -1);
Calendar startCalender = Calendar.getInstance(); Calendar startCalender = Calendar.getInstance();
Calendar endCalender = Calendar.getInstance(); Calendar endCalender = Calendar.getInstance();
@@ -408,18 +439,15 @@ public class OpenScale {
public void registerFragment(FragmentUpdateListener fragment) { public void registerFragment(FragmentUpdateListener fragment) {
fragmentList.add(fragment); fragmentList.add(fragment);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int selectedUserId = getSelectedScaleUserId();
int selectedUserId = prefs.getInt("selectedUserId", -1);
scaleMeasurementList = measurementDAO.getAll(selectedUserId); scaleMeasurementList = measurementDAO.getAll(selectedUserId);
fragment.updateOnView(scaleMeasurementList); fragment.updateOnView(scaleMeasurementList);
} }
public void updateScaleData() public void updateScaleData() {
{ int selectedUserId = getSelectedScaleUserId();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int selectedUserId = prefs.getInt("selectedUserId", -1);
scaleMeasurementList = measurementDAO.getAll(selectedUserId); scaleMeasurementList = measurementDAO.getAll(selectedUserId);

3
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExingtechY1.java
View File

@@ -62,8 +62,7 @@ public class BluetoothExingtechY1 extends BluetoothCommunication {
byte height = (byte)(selectedUser.getBodyHeight() & 0xff); // cm byte height = (byte)(selectedUser.getBodyHeight() & 0xff); // cm
byte age = (byte)(selectedUser.getAge(new Date()) & 0xff); byte age = (byte)(selectedUser.getAge(new Date()) & 0xff);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int userId = selectedUser.getId();
int userId = prefs.getInt("selectedUserId", -1);
byte cmdByte[] = {(byte)0x10, (byte)userId, gender, age, height}; byte cmdByte[] = {(byte)0x10, (byte)userId, gender, age, height};

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
View File

@@ -285,7 +285,7 @@ public class BluetoothMiScale extends BluetoothCommunication {
prefs.edit().putInt("uniqueNumber", uniqueNumber).commit(); prefs.edit().putInt("uniqueNumber", uniqueNumber).commit();
} }
int userId = prefs.getInt("selectedUserId", -1); int userId = OpenScale.getInstance(context).getSelectedScaleUserId();
return uniqueNumber + userId; return uniqueNumber + userId;
} }

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java
View File

@@ -257,7 +257,7 @@ public class BluetoothMiScale2 extends BluetoothCommunication {
prefs.edit().putInt("uniqueNumber", uniqueNumber).commit(); prefs.edit().putInt("uniqueNumber", uniqueNumber).commit();
} }
int userId = prefs.getInt("selectedUserId", -1); int userId = OpenScale.getInstance(context).getSelectedScaleUserId();
return uniqueNumber + userId; return uniqueNumber + userId;
} }

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiMini.java
View File

@@ -154,7 +154,7 @@ public class BluetoothYunmaiMini extends BluetoothCommunication {
prefs.edit().putInt("uniqueNumber", uniqueNumber).commit(); prefs.edit().putInt("uniqueNumber", uniqueNumber).commit();
} }
int userId = prefs.getInt("selectedUserId", -1); int userId = OpenScale.getInstance(context).getSelectedScaleUserId();
return uniqueNumber + userId; return uniqueNumber + userId;
} }

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE.java
View File

@@ -152,7 +152,7 @@ public class BluetoothYunmaiSE extends BluetoothCommunication {
prefs.edit().putInt("uniqueNumber", uniqueNumber).commit(); prefs.edit().putInt("uniqueNumber", uniqueNumber).commit();
} }
int userId = prefs.getInt("selectedUserId", -1); int userId = OpenScale.getInstance(context).getSelectedScaleUserId();
return uniqueNumber + userId; return uniqueNumber + userId;
} }

46
android_app/app/src/main/java/com/health/openscale/core/database/AppDatabase.java
View File

@@ -16,18 +16,62 @@
package com.health.openscale.core.database; package com.health.openscale.core.database;
import android.arch.persistence.db.SupportSQLiteDatabase;
import android.arch.persistence.room.Database; import android.arch.persistence.room.Database;
import android.arch.persistence.room.RoomDatabase; import android.arch.persistence.room.RoomDatabase;
import android.arch.persistence.room.TypeConverters; import android.arch.persistence.room.TypeConverters;
import android.arch.persistence.room.migration.Migration;
import android.support.annotation.NonNull;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;
import com.health.openscale.core.utils.Converters; import com.health.openscale.core.utils.Converters;
@Database(entities = {ScaleMeasurement.class, ScaleUser.class}, version = 1) @Database(entities = {ScaleMeasurement.class, ScaleUser.class}, version = 2)
@TypeConverters({Converters.class}) @TypeConverters({Converters.class})
public abstract class AppDatabase extends RoomDatabase { public abstract class AppDatabase extends RoomDatabase {
public abstract ScaleMeasurementDAO measurementDAO(); public abstract ScaleMeasurementDAO measurementDAO();
public abstract ScaleUserDAO userDAO(); public abstract ScaleUserDAO userDAO();
public static final Migration MIGRATION_1_2 = new Migration(1, 2) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase database) {
database.beginTransaction();
try {
// Drop old index on datetime only
database.execSQL("DROP INDEX index_scaleMeasurements_datetime");
// Rename old table
database.execSQL("ALTER TABLE scaleMeasurements RENAME TO scaleMeasurementsOld");
// Create new table with foreign key
database.execSQL("CREATE TABLE scaleMeasurements"
+ " (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"
+ " userId INTEGER NOT NULL, enabled INTEGER NOT NULL,"
+ " datetime INTEGER, weight REAL NOT NULL, fat REAL NOT NULL,"
+ " water REAL NOT NULL, muscle REAL NOT NULL, lbw REAL NOT NULL,"
+ " waist REAL NOT NULL, hip REAL NOT NULL, bone REAL NOT NULL,"
+ " comment TEXT, FOREIGN KEY(userId) REFERENCES scaleUsers(id)"
+ " ON UPDATE NO ACTION ON DELETE CASCADE)");
// Create new index on datetime + userId
database.execSQL("CREATE UNIQUE INDEX index_scaleMeasurements_datetime_userId"
+ " ON scaleMeasurements (datetime, userId)");
// Copy data from the old table, ignoring those with invalid userId (if any)
database.execSQL("INSERT INTO scaleMeasurements"
+ " SELECT * FROM scaleMeasurementsOld"
+ " WHERE userId IN (SELECT id from scaleUsers)");
// Delete old table
database.execSQL("DROP TABLE scaleMeasurementsOld");
database.setTransactionSuccessful();
}
finally {
database.endTransaction();
}
}
};
} }

252
android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java
View File

@@ -16,7 +16,6 @@
package com.health.openscale.core.database; package com.health.openscale.core.database;
import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.SQLException; import android.database.SQLException;
@@ -29,7 +28,6 @@ import com.health.openscale.core.datatypes.ScaleMeasurement;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Locale; import java.util.Locale;
public class ScaleDatabase extends SQLiteOpenHelper { public class ScaleDatabase extends SQLiteOpenHelper {
@@ -68,10 +66,6 @@ public class ScaleDatabase extends SQLiteOpenHelper {
COLUMN_NAME_ENABLE + " INTEGER" + COLUMN_NAME_ENABLE + " INTEGER" +
")"; ")";
private static final String SQL_DELETE_ENTRIES =
"DROP TABLE IF EXISTS " + TABLE_NAME;
private static String[] projection = { private static String[] projection = {
COLUMN_NAME_ID, COLUMN_NAME_ID,
COLUMN_NAME_USER_ID, COLUMN_NAME_USER_ID,
@@ -88,9 +82,6 @@ public class ScaleDatabase extends SQLiteOpenHelper {
COLUMN_NAME_ENABLE COLUMN_NAME_ENABLE
}; };
private final SQLiteDatabase dbWrite = getWritableDatabase();
private final SQLiteDatabase dbRead = getReadableDatabase();
private SimpleDateFormat formatDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US); private SimpleDateFormat formatDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US);
public ScaleDatabase(Context context) { public ScaleDatabase(Context context) {
@@ -126,254 +117,13 @@ public class ScaleDatabase extends SQLiteOpenHelper {
} }
} }
public void clearScaleData(int userId) {
dbWrite.delete(TABLE_NAME, COLUMN_NAME_USER_ID + "=" + Integer.toString(userId), null);
}
public boolean insertEntry(ScaleMeasurement scaleMeasurement) {
SQLiteDatabase db = getWritableDatabase();
Cursor cursorScaleDB = db.query(TABLE_NAME, new String[] {COLUMN_NAME_DATE_TIME}, COLUMN_NAME_DATE_TIME + "=? AND " + COLUMN_NAME_USER_ID + "=?",
new String[] {formatDateTime.format(scaleMeasurement.getDateTime()), Integer.toString(scaleMeasurement.getUserId())}, null, null, null);
// we don't want double entries
if (cursorScaleDB.getCount() > 0) {
cursorScaleDB.close();
return false;
} else {
ContentValues values = new ContentValues();
values.put(COLUMN_NAME_USER_ID, scaleMeasurement.getUserId());
values.put(COLUMN_NAME_DATE_TIME, formatDateTime.format(scaleMeasurement.getDateTime()));
values.put(COLUMN_NAME_WEIGHT, scaleMeasurement.getWeight());
values.put(COLUMN_NAME_FAT, scaleMeasurement.getFat());
values.put(COLUMN_NAME_WATER, scaleMeasurement.getWater());
values.put(COLUMN_NAME_MUSCLE, scaleMeasurement.getMuscle());
values.put(COLUMN_NAME_LBW, scaleMeasurement.getLbw());
values.put(COLUMN_NAME_BONE, scaleMeasurement.getBone());
values.put(COLUMN_NAME_WAIST, scaleMeasurement.getWaist());
values.put(COLUMN_NAME_HIP, scaleMeasurement.getHip());
values.put(COLUMN_NAME_COMMENT, scaleMeasurement.getComment());
values.put(COLUMN_NAME_ENABLE, 1);
try
{
db.insertOrThrow(TABLE_NAME, null, values);
}
catch (SQLException e)
{
Log.e("ScaleDatabase", "An error occured while inserting a new entry into the scale database: " + e.toString());
cursorScaleDB.close();
return false;
}
}
cursorScaleDB.close();
return true;
}
public void updateEntry(long id, ScaleMeasurement scaleMeasurement) {
ContentValues values = new ContentValues();
values.put(COLUMN_NAME_DATE_TIME, formatDateTime.format(scaleMeasurement.getDateTime()));
values.put(COLUMN_NAME_WEIGHT, scaleMeasurement.getWeight());
values.put(COLUMN_NAME_FAT, scaleMeasurement.getFat());
values.put(COLUMN_NAME_WATER, scaleMeasurement.getWater());
values.put(COLUMN_NAME_MUSCLE, scaleMeasurement.getMuscle());
values.put(COLUMN_NAME_LBW, scaleMeasurement.getLbw());
values.put(COLUMN_NAME_BONE, scaleMeasurement.getBone());
values.put(COLUMN_NAME_WAIST, scaleMeasurement.getWaist());
values.put(COLUMN_NAME_HIP, scaleMeasurement.getHip());
values.put(COLUMN_NAME_COMMENT, scaleMeasurement.getComment());
values.put(COLUMN_NAME_ENABLE, 1);
dbWrite.update(TABLE_NAME, values, COLUMN_NAME_ID + "=" + id, null);
}
public ScaleMeasurement[] getTupleDataEntry(int userId, long id)
{
Cursor cursorScaleDB;
ScaleMeasurement[] tupleScaleData = new ScaleMeasurement[3];
// selected scale data entry
cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_ID + "=?", // The columns for the WHERE clause
new String[] {Integer.toString(userId), Long.toString(id)}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
null, // The sort order
"1" // Limit
);
if (cursorScaleDB.getCount() == 1) {
cursorScaleDB.moveToFirst();
tupleScaleData[1] = readAtCursor(cursorScaleDB);
} else {
tupleScaleData[1] = new ScaleMeasurement();
}
// previous scale entry
cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_DATE_TIME + "<? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[] {Integer.toString(userId), formatDateTime.format(tupleScaleData[1].getDateTime())}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
COLUMN_NAME_DATE_TIME + " DESC", // The sort order
"1" // Limit
);
if (cursorScaleDB.getCount() == 1) {
cursorScaleDB.moveToFirst();
tupleScaleData[0] = readAtCursor(cursorScaleDB);
} else {
tupleScaleData[0] = null;
}
cursorScaleDB.close();
// next scale data entry
cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_DATE_TIME + ">? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[] {Integer.toString(userId), formatDateTime.format(tupleScaleData[1].getDateTime())}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
COLUMN_NAME_DATE_TIME, // The sort order
"1" // Limit
);
if (cursorScaleDB.getCount() == 1) {
cursorScaleDB.moveToFirst();
tupleScaleData[2] = readAtCursor(cursorScaleDB);
} else {
tupleScaleData[2] = null;
}
return tupleScaleData;
}
public void deleteEntry(long id) {
//dbWrite.delete(TABLE_NAME, COLUMN_NAME_ID + "= ?", new String[] {String.valueOf(id)});
ContentValues values = new ContentValues();
values.put(COLUMN_NAME_ENABLE, 0);
dbWrite.update(TABLE_NAME, values, COLUMN_NAME_ID + "=" + id, null);
}
public int[] getCountsOfAllMonth(int userId, int year) {
int [] numOfMonth = new int[12];
Calendar start_cal = Calendar.getInstance();
Calendar end_cal = Calendar.getInstance();
for (int i=0; i<12; i++) {
start_cal.set(year, i, 1, 0, 0, 0);
end_cal.set(year, i, 1, 0, 0, 0);
end_cal.add(Calendar.MONTH, 1);
Cursor cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
new String[]{"count(*)"}, // The columns to return
COLUMN_NAME_DATE_TIME + " >= ? AND " + COLUMN_NAME_DATE_TIME + " < ? AND " + COLUMN_NAME_USER_ID + "=? AND "+ COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[]{formatDateTime.format(start_cal.getTime()), formatDateTime.format(end_cal.getTime()), Integer.toString(userId)}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
null // The sort order
);
cursorScaleDB.moveToFirst();
numOfMonth[i] = cursorScaleDB.getInt(0);
cursorScaleDB.close();
}
return numOfMonth;
}
public ArrayList<ScaleMeasurement> getScaleDataOfMonth(int userId, int year, int month) {
ArrayList<ScaleMeasurement> scaleMeasurementList = new ArrayList<ScaleMeasurement>();
String sortOrder = COLUMN_NAME_DATE_TIME + " DESC";
Calendar start_cal = Calendar.getInstance();
Calendar end_cal = Calendar.getInstance();
start_cal.set(year, month, 1, 0, 0, 0);
end_cal.set(year, month, 1, 0, 0, 0);
end_cal.add(Calendar.MONTH, 1);
Cursor cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_DATE_TIME + " >= ? AND " + COLUMN_NAME_DATE_TIME + " < ? AND " + COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[]{formatDateTime.format(start_cal.getTime()), formatDateTime.format(end_cal.getTime()), Integer.toString(userId)}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
sortOrder // The sort order
);
cursorScaleDB.moveToFirst();
while (!cursorScaleDB.isAfterLast()) {
scaleMeasurementList.add(readAtCursor(cursorScaleDB));
cursorScaleDB.moveToNext();
}
cursorScaleDB.close();
return scaleMeasurementList;
}
public ArrayList<ScaleMeasurement> getScaleDataOfYear(int userId, int year) {
ArrayList<ScaleMeasurement> scaleMeasurementList = new ArrayList<ScaleMeasurement>();
String sortOrder = COLUMN_NAME_DATE_TIME + " DESC";
Calendar start_cal = Calendar.getInstance();
Calendar end_cal = Calendar.getInstance();
start_cal.set(year, Calendar.JANUARY, 1, 0, 0, 0);
end_cal.set(year+1, Calendar.JANUARY, 1, 0, 0, 0);
Cursor cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_DATE_TIME + " >= ? AND " + COLUMN_NAME_DATE_TIME + " < ? AND " + COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[]{formatDateTime.format(start_cal.getTime()), formatDateTime.format(end_cal.getTime()), Integer.toString(userId)}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
sortOrder // The sort order
);
cursorScaleDB.moveToFirst();
while (!cursorScaleDB.isAfterLast()) {
scaleMeasurementList.add(readAtCursor(cursorScaleDB));
cursorScaleDB.moveToNext();
}
cursorScaleDB.close();
return scaleMeasurementList;
}
public ArrayList<ScaleMeasurement> getScaleDataList(int userId) { public ArrayList<ScaleMeasurement> getScaleDataList(int userId) {
ArrayList<ScaleMeasurement> scaleMeasurementList = new ArrayList<ScaleMeasurement>(); ArrayList<ScaleMeasurement> scaleMeasurementList = new ArrayList<ScaleMeasurement>();
try { try {
String sortOrder = COLUMN_NAME_DATE_TIME + " DESC"; String sortOrder = COLUMN_NAME_DATE_TIME + " DESC";
Cursor cursorScaleDB = dbRead.query( Cursor cursorScaleDB = getReadableDatabase().query(
TABLE_NAME, // The table to query TABLE_NAME, // The table to query
projection, // The columns to return projection, // The columns to return
COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause

83
android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java
View File

@@ -16,10 +16,8 @@
package com.health.openscale.core.database; package com.health.openscale.core.database;
import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log; import android.util.Log;
@@ -60,9 +58,6 @@ public class ScaleUserDatabase extends SQLiteOpenHelper {
COLUMN_NAME_GOAL_DATE + " TEXT" + COLUMN_NAME_GOAL_DATE + " TEXT" +
")"; ")";
private static final String SQL_DELETE_ENTRIES =
"DROP TABLE IF EXISTS " + TABLE_NAME;
private static String[] projection = { private static String[] projection = {
COLUMN_NAME_ID, COLUMN_NAME_ID,
COLUMN_NAME_USER_NAME, COLUMN_NAME_USER_NAME,
@@ -99,84 +94,6 @@ public class ScaleUserDatabase extends SQLiteOpenHelper {
} }
} }
public void clearDatabase() {
SQLiteDatabase db = getWritableDatabase();
db.delete(TABLE_NAME, null, null);
}
public boolean insertEntry(ScaleUser scaleUser) {
SQLiteDatabase db = getWritableDatabase();
ContentValues values = new ContentValues();
values.put(COLUMN_NAME_USER_NAME, scaleUser.getUserName());
values.put(COLUMN_NAME_BIRTHDAY, formatDateTime.format(scaleUser.getBirthday()));
values.put(COLUMN_NAME_BODY_HEIGHT, scaleUser.getBodyHeight());
values.put(COLUMN_NAME_SCALE_UNIT, scaleUser.getScaleUnit().toInt());
values.put(COLUMN_NAME_GENDER, scaleUser.getGender().toInt());
values.put(COLUMN_NAME_INITIAL_WEIGHT, scaleUser.getInitialWeight());
values.put(COLUMN_NAME_GOAL_WEIGHT, scaleUser.getGoalWeight());
values.put(COLUMN_NAME_GOAL_DATE, formatDateTime.format(scaleUser.getGoalDate()));
try
{
db.insertOrThrow(TABLE_NAME, null, values);
}
catch (SQLException e)
{
Log.e("ScaleUserDatabase", "An error occured while inserting a new entry into the scale user database: " + e.toString());
return false;
}
return true;
}
public void deleteEntry(int id) {
SQLiteDatabase db = getWritableDatabase();
db.delete(TABLE_NAME, COLUMN_NAME_ID + "= ?", new String[] {String.valueOf(id)});
}
public void updateScaleUser(ScaleUser scaleUser)
{
SQLiteDatabase db = getWritableDatabase();
ContentValues values = new ContentValues();
values.put(COLUMN_NAME_USER_NAME, scaleUser.getUserName());
values.put(COLUMN_NAME_BIRTHDAY, formatDateTime.format(scaleUser.getBirthday()));
values.put(COLUMN_NAME_BODY_HEIGHT, scaleUser.getBodyHeight());
values.put(COLUMN_NAME_SCALE_UNIT, scaleUser.getScaleUnit().toInt());
values.put(COLUMN_NAME_GENDER, scaleUser.getGender().toInt());
values.put(COLUMN_NAME_INITIAL_WEIGHT, scaleUser.getInitialWeight());
values.put(COLUMN_NAME_GOAL_WEIGHT, scaleUser.getGoalWeight());
values.put(COLUMN_NAME_GOAL_DATE, formatDateTime.format(scaleUser.getGoalDate()));
db.update(TABLE_NAME, values, COLUMN_NAME_ID + "=" + scaleUser.getId(), null);
}
public ScaleUser getScaleUser(int id)
{
SQLiteDatabase db = getReadableDatabase();
Cursor cursorScaleDB = db.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_ID + "=?", // The columns for the WHERE clause
new String[] {Integer.toString(id)}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
null // The sort order
);
cursorScaleDB.moveToFirst();
ScaleUser scaleUser = readAtCursor(cursorScaleDB);
cursorScaleDB.close();
return scaleUser;
}
public ArrayList<ScaleUser> getScaleUserList() { public ArrayList<ScaleUser> getScaleUserList() {
SQLiteDatabase db = getReadableDatabase(); SQLiteDatabase db = getReadableDatabase();
ArrayList<ScaleUser> scaleUserDBEntries = new ArrayList<ScaleUser>(); ArrayList<ScaleUser> scaleUserDBEntries = new ArrayList<ScaleUser>();

9
android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java
View File

@@ -18,6 +18,7 @@ package com.health.openscale.core.datatypes;
import android.arch.persistence.room.ColumnInfo; import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity; import android.arch.persistence.room.Entity;
import android.arch.persistence.room.ForeignKey;
import android.arch.persistence.room.Index; import android.arch.persistence.room.Index;
import android.arch.persistence.room.PrimaryKey; import android.arch.persistence.room.PrimaryKey;
@@ -26,7 +27,13 @@ import com.j256.simplecsv.common.CsvColumn;
import java.util.Date; import java.util.Date;
@Entity(tableName = "scaleMeasurements", indices = {@Index(value = {"datetime"}, unique = true)}) @Entity(tableName = "scaleMeasurements",
indices = {@Index(value = {"datetime", "userId"}, unique = true)},
foreignKeys = @ForeignKey(
entity = ScaleUser.class,
parentColumns = "id",
childColumns = "userId",
onDelete = ForeignKey.CASCADE))
public class ScaleMeasurement implements Cloneable { public class ScaleMeasurement implements Cloneable {
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)

6
android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
View File

@@ -301,8 +301,9 @@ public class DataEntryActivity extends Activity {
private class onClickListenerAdd implements View.OnClickListener { private class onClickListenerAdd implements View.OnClickListener {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); OpenScale openScale = OpenScale.getInstance(getApplicationContext());
int selectedUserId = prefs.getInt("selectedUserId", -1);
int selectedUserId = openScale.getSelectedScaleUserId();
if (selectedUserId == -1) { if (selectedUserId == -1) {
AlertDialog.Builder infoDialog = new AlertDialog.Builder(context); AlertDialog.Builder infoDialog = new AlertDialog.Builder(context);
@@ -317,7 +318,6 @@ public class DataEntryActivity extends Activity {
measurement.saveTo(scaleMeasurement); measurement.saveTo(scaleMeasurement);
} }
OpenScale openScale = OpenScale.getInstance(getApplicationContext());
openScale.addScaleData(scaleMeasurement); openScale.addScaleData(scaleMeasurement);
finish(); finish();

35
android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
View File

@@ -246,9 +246,7 @@ public class UserSettingsActivity extends Activity {
lastUserId = scaleUser.get(0).getId(); lastUserId = scaleUser.get(0).getId();
} }
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); openScale.selectScaleUser(lastUserId);
prefs.edit().putInt("selectedUserId", lastUserId).commit();
openScale.updateScaleData(); openScale.updateScaleData();
Intent returnIntent = new Intent(); Intent returnIntent = new Intent();
@@ -282,57 +280,52 @@ public class UserSettingsActivity extends Activity {
float initial_weight = Float.valueOf(txtInitialWeight.getText().toString()); float initial_weight = Float.valueOf(txtInitialWeight.getText().toString());
float goal_weight = Float.valueOf(txtGoalWeight.getText().toString()); float goal_weight = Float.valueOf(txtGoalWeight.getText().toString());
int scale_unit = -1; Converters.WeightUnit scale_unit = Converters.WeightUnit.KG;
switch (checkedRadioButtonId) { switch (checkedRadioButtonId) {
case R.id.btnRadioKG: case R.id.btnRadioKG:
scale_unit = 0; scale_unit = Converters.WeightUnit.KG;
break; break;
case R.id.btnRadioLB: case R.id.btnRadioLB:
scale_unit = 1; scale_unit = Converters.WeightUnit.LB;
break; break;
case R.id.btnRadioST: case R.id.btnRadioST:
scale_unit = 2; scale_unit = Converters.WeightUnit.ST;
break; break;
} }
int gender = -1; Converters.Gender gender = Converters.Gender.MALE;
switch (checkedGenderId) { switch (checkedGenderId) {
case R.id.btnRadioMale: case R.id.btnRadioMale:
gender = 0; gender = Converters.Gender.MALE;
break; break;
case R.id.btnRadioWoman: case R.id.btnRadioWoman:
gender = 1; gender = Converters.Gender.FEMALE;
break; break;
} }
int id = 0;
final ScaleUser scaleUser = new ScaleUser(); final ScaleUser scaleUser = new ScaleUser();
scaleUser.setUserName(name); scaleUser.setUserName(name);
scaleUser.setBirthday(birthday); scaleUser.setBirthday(birthday);
scaleUser.setBodyHeight(body_height); scaleUser.setBodyHeight(body_height);
scaleUser.setScaleUnit(Converters.fromWeightUnitInt(scale_unit)); scaleUser.setScaleUnit(scale_unit);
scaleUser.setGender(Converters.fromGenderInt(gender)); scaleUser.setGender(gender);
scaleUser.setConvertedInitialWeight(initial_weight); scaleUser.setConvertedInitialWeight(initial_weight);
scaleUser.setGoalWeight(goal_weight); scaleUser.setGoalWeight(goal_weight);
scaleUser.setGoalDate(goal_date); scaleUser.setGoalDate(goal_date);
if (getIntent().getExtras().getInt("mode") == EDIT_USER_REQUEST) { if (getIntent().getExtras().getInt("mode") == EDIT_USER_REQUEST) {
id = getIntent().getExtras().getInt("id"); int id = getIntent().getExtras().getInt("id");
scaleUser.setId(id); scaleUser.setId(id);
openScale.updateScaleUser(scaleUser); openScale.updateScaleUser(scaleUser);
} else { } else {
openScale.addScaleUser(scaleUser); int id = openScale.addScaleUser(scaleUser);
scaleUser.setId(id);
id = openScale.getScaleUserList().get(openScale.getScaleUserList().size() - 1).getId();
} }
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); openScale.selectScaleUser(scaleUser.getId());
prefs.edit().putInt("selectedUserId", id).commit();
openScale.updateScaleData(); openScale.updateScaleData();
Intent returnIntent = new Intent(); Intent returnIntent = new Intent();

8
android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
View File

@@ -476,13 +476,13 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
if (parent.getChildCount() > 0) { if (parent.getChildCount() > 0) {
((TextView) parent.getChildAt(0)).setTextColor(Color.GRAY); ((TextView) parent.getChildAt(0)).setTextColor(Color.GRAY);
List<ScaleUser> scaleUserList = OpenScale.getInstance(getContext()).getScaleUserList(); OpenScale openScale = OpenScale.getInstance(getContext());
List<ScaleUser> scaleUserList = openScale.getScaleUserList();
ScaleUser scaleUser = scaleUserList.get(position); ScaleUser scaleUser = scaleUserList.get(position);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); openScale.selectScaleUser(scaleUser.getId());
prefs.edit().putInt("selectedUserId", scaleUser.getId()).commit(); openScale.updateScaleData();
OpenScale.getInstance(getContext()).updateScaleData();
} }
} }

3
android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
View File

@@ -263,8 +263,7 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(v.getContext()); int selectedUserId = OpenScale.getInstance(getContext()).getSelectedScaleUserId();
int selectedUserId = prefs.getInt("selectedUserId", -1);
if (selectedUserId == -1) if (selectedUserId == -1)
{ {

10
android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java
View File

@@ -119,12 +119,14 @@ public class BackupPreferences extends PreferenceFragment {
importBackup("openScale.db", exportDir); importBackup("openScale.db", exportDir);
List<ScaleUser> scaleUserList = OpenScale.getInstance(getActivity().getApplicationContext()).getScaleUserList(); OpenScale openScale = OpenScale.getInstance(getActivity().getApplicationContext());
openScale.reopenDatabase();
List<ScaleUser> scaleUserList = openScale.getScaleUserList();
if (!scaleUserList.isEmpty()) { if (!scaleUserList.isEmpty()) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); openScale.selectScaleUser(scaleUserList.get(0).getId());
prefs.edit().putInt("selectedUserId", scaleUserList.get(0).getId()).commit(); openScale.updateScaleData();
OpenScale.getInstance(getActivity().getApplicationContext()).updateScaleData();
} }
return true; return true;

6
android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java
View File

@@ -247,10 +247,10 @@ public class MeasurementPreferences extends PreferenceFragment implements Shared
deleteAllDialog.setPositiveButton(getResources().getString(R.string.label_yes), new DialogInterface.OnClickListener() { deleteAllDialog.setPositiveButton(getResources().getString(R.string.label_yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); OpenScale openScale = OpenScale.getInstance(getActivity().getApplicationContext());
int selectedUserId = prefs.getInt("selectedUserId", -1); int selectedUserId = openScale.getSelectedScaleUserId();
OpenScale.getInstance(getActivity().getApplicationContext()).clearScaleData(selectedUserId); openScale.clearScaleData(selectedUserId);
Toast.makeText(getActivity().getApplicationContext(), getResources().getString(R.string.info_data_all_deleted), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity().getApplicationContext(), getResources().getString(R.string.info_data_all_deleted), Toast.LENGTH_SHORT).show();
} }

10
android_app/app/src/main/java/com/health/openscale/gui/preferences/UsersPreferences.java
View File

@@ -41,15 +41,13 @@ public class UsersPreferences extends PreferenceFragment {
updateUserPreferences(); updateUserPreferences();
} }
private void updateUserPreferences() private void updateUserPreferences() {
{ OpenScale openScale = OpenScale.getInstance(getActivity().getApplicationContext());
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
int selectedUserId = prefs.getInt("selectedUserId", -1); int selectedUserId = openScale.getSelectedScaleUserId();
getPreferenceScreen().removeAll(); getPreferenceScreen().removeAll();
OpenScale openScale = OpenScale.getInstance(getActivity().getApplicationContext());
List<ScaleUser> scaleUserList = openScale.getScaleUserList(); List<ScaleUser> scaleUserList = openScale.getScaleUserList();
for (ScaleUser scaleUser : scaleUserList) for (ScaleUser scaleUser : scaleUserList)