Fixed an ArrayIndexOutOfBoundsException when summarising completely e…

…mpty data - why does that happen? who knows.
fridgecow · Jan 23, 2018 · f35ca35 · f35ca35
1 parent b8aabc9
commit f35ca35
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":172},"path":"app-release.apk","properties":{"packageId":"com.fridgecow.smartalarm","split":"","minSdkVersion":"25"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":173},"path":"app-release.apk","properties":{"packageId":"com.fridgecow.smartalarm","split":"","minSdkVersion":"25"}}]
diff --git a/app/src/main/java/com/fridgecow/smartalarm/SleepData.java b/app/src/main/java/com/fridgecow/smartalarm/SleepData.java
@@ -275,7 +275,13 @@ public double getSDNNAt(double time){
     }
 
     public double getTimeAt(int index){
-        return mSleepMotion.get(index).getX();
+        if(index < 0){
+            return mSleepMotion.get(0).getX();
+        }else if(index >= mSleepMotion.size()){
+            return mSleepMotion.get(mSleepMotion.size() -1).getX();
+        }else {
+            return mSleepMotion.get(index).getX();
+        }
     }
 
     public double getMotionMean(){

diff --git a/app/src/main/java/com/fridgecow/smartalarm/SleepSummaryData.java b/app/src/main/java/com/fridgecow/smartalarm/SleepSummaryData.java
@@ -136,7 +136,7 @@ public SleepSummaryData(SleepData data){
         }
 
         //Deal with last section
-        if(!sleeping){
+        if(!sleeping && data.getDataLength() > 0){
             add(new DataRegion(
                     lastTime,
                     data.getTimeAt(data.getDataLength()-1),
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":172},"path":"app-release.apk","properties":{"packageId":"com.fridgecow.smartalarm","split":"","minSdkVersion":"25"}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":173},"path":"app-release.apk","properties":{"packageId":"com.fridgecow.smartalarm","split":"","minSdkVersion":"25"}}]