From e66e5beee8e1f93c81f673718390448326148317 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Tue, 8 May 2018 20:47:00 +0200 Subject: [PATCH] Use user id from measurement when getting prev and next --- .../main/java/com/health/openscale/core/OpenScale.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 49aa3ea8..97dcdce3 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 @@ -252,9 +252,14 @@ public class OpenScale { { ScaleMeasurement[] tupleScaleData = new ScaleMeasurement[3]; - tupleScaleData[0] = measurementDAO.getPrevious(id, getSelectedScaleUser().getId()); + tupleScaleData[0] = null; tupleScaleData[1] = measurementDAO.get(id); - tupleScaleData[2] = measurementDAO.getNext(id, getSelectedScaleUser().getId()); + tupleScaleData[2] = null; + + if (tupleScaleData[1] != null) { + tupleScaleData[0] = measurementDAO.getPrevious(id, tupleScaleData[1].getUserId()); + tupleScaleData[2] = measurementDAO.getNext(id, tupleScaleData[1].getUserId()); + } return tupleScaleData; }