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

Merge pull request #220 from erijo/issue-218

Browse Source 
Handle invalid user being selected in config
This commit is contained in:
OliE
2018-03-10 11:25:50 +01:00
committed by GitHub
parent ecf47b4451 3014ceb2a2
commit e13fe9ec12
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,6 +183,10 @@ public class OpenScale {
final int selectedUserId = getSelectedScaleUserId(); final int selectedUserId = getSelectedScaleUserId();
if (selectedUserId != -1) { if (selectedUserId != -1) {
selectedScaleUser = userDAO.get(selectedUserId); selectedScaleUser = userDAO.get(selectedUserId);
if (selectedScaleUser == null) {
selectScaleUser(-1);
throw new Exception("could not find the selected user");
}
return selectedScaleUser; return selectedScaleUser;
} }
} catch (Exception e) { } catch (Exception e) {
@@ -221,7 +225,7 @@ public class OpenScale {
public ScaleMeasurement[] getTupleScaleData(int id) public ScaleMeasurement[] getTupleScaleData(int id)
{ {
ScaleMeasurement[] tupleScaleData = new ScaleMeasurement[3]; ScaleMeasurement[] tupleScaleData = new ScaleMeasurement[3];
tupleScaleData[0] = measurementDAO.getPrevious(id, getSelectedScaleUser().getId()); tupleScaleData[0] = measurementDAO.getPrevious(id, getSelectedScaleUser().getId());
tupleScaleData[1] = measurementDAO.get(id); tupleScaleData[1] = measurementDAO.get(id);