Fixed weird issue with raw exporting. Value array is empty while the …

…data is showing it has index's. Currently assuming that this data is malformed.
frc2052 · Mar 17, 2018 · 567116a · 567116a
1 parent bdd3c72
commit 567116a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId 'com.team2052.frckrawler'
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 41
-        versionName "3.3.1"
+        versionCode 42
+        versionName "3.3.2"
         multiDexEnabled true
 
         // Needed for support lib 23.2.0+ on pre-L devices

diff --git a/app/src/main/java/com/team2052/frckrawler/database/metric/CompileUtil.java b/app/src/main/java/com/team2052/frckrawler/database/metric/CompileUtil.java
@@ -72,17 +72,22 @@ public class CompileUtil {
 
         if (data.has("value")) {
             return data.get("value").toString();
-        } else {
+        } else if (data.has("values")) {
             JsonObject metricData = JSON.getAsJsonObject(metric.getData());
             JsonArray dataIndexes = data.getAsJsonArray("values");
             JsonArray valueArray = metricData.getAsJsonArray("values");
             List<String> selected = Lists.newArrayListWithExpectedSize(dataIndexes.size());
-            for (int i = 0; i < dataIndexes.size(); i++) {
-                int dataIndex = dataIndexes.get(i).getAsInt();
-                selected.add(valueArray.get(dataIndex).toString());
+            if (valueArray.size() > 0) {
+                for (int i = 0; i < dataIndexes.size(); i++) {
+                    int dataIndex = dataIndexes.get(i).getAsInt();
+                    selected.add(valueArray.get(dataIndex).toString());
+                }
+                return Joiner.on(", ").join(selected);
+            } else {
+                return "";
             }
-            return Joiner.on(", ").join(selected);
         }
+        return "";
     };
 
     public static Func1<List<MetricValue>, CompiledMetricValue> metricValuesToCompiledValue(Robot robot, Metric metric, float compileWeight) {