From 534207ebb1648c2d35d81a2c13be7279ab5fd7f3 Mon Sep 17 00:00:00 2001
From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com>
Date: Sat, 15 Mar 2025 06:09:47 -0600
Subject: [PATCH] Fix more scouting data crashing

---
 app/build.gradle.kts                          |  4 ++--
 .../ridgescout/ui/data/TeamsFragment.java     | 19 ++++++++++++-------
 .../ridgescout/ui/transfer/CSVExport.java     |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8bcc618..c96514c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         applicationId = "com.ridgebotics.ridgescout"
         minSdk = 24
         targetSdk = 34
-        versionCode = 10    // **IMPORTANT** Increment this before releasing on github
-        versionName = "1.3"// **IMPORTANT** Change this before releasing on github (<Year num since 2024>.<Update Version>)
+        versionCode = 11    // **IMPORTANT** Increment this before releasing on github
+        versionName = "1.4"// **IMPORTANT** Change this before releasing on github (<Year num since 2024>.<Update Version>)
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java
index d1229af..73b5c6f 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/data/TeamsFragment.java
@@ -101,8 +101,8 @@ public class TeamsFragment extends Fragment {
 //        tv.setTextSize(16);
 //        ll.addView(tv);
 
-        add_pit_data(team);
-        add_match_data(team, mode);
+        try {add_pit_data(team);}catch(Exception e){AlertManager.error(e);}
+        try {add_match_data(team, mode);}catch(Exception e){AlertManager.error(e);}
     }
 
     public void add_pit_data(frcTeam team){
@@ -273,7 +273,8 @@ public class TeamsFragment extends Fragment {
                 binding.matchArea.addView(tv);
 
 
-                match_latest_values[i].add_individual_view(binding.matchArea, psda.data.array[i]);
+                if(psda.data.array[i] != null)
+                    match_latest_values[i].add_individual_view(binding.matchArea, psda.data.array[i]);
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -293,7 +294,8 @@ public class TeamsFragment extends Fragment {
             try {
                 ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
                 for (int a = 0; a < data.length; a++) {
-                    data[a][i] = psda.data.array[a];
+                    if(psda.data.array[a] != null && psda.data.array[a].get() != null)
+                        data[a][i] = psda.data.array[a];
                 }
             } catch (Exception e){
                 e.printStackTrace();
@@ -313,7 +315,8 @@ public class TeamsFragment extends Fragment {
             tv.setTextSize(30);
             binding.matchArea.addView(tv);
 
-            match_latest_values[i].add_compiled_view(binding.matchArea, data[i]);
+            if(data[i] != null)
+                match_latest_values[i].add_compiled_view(binding.matchArea, data[i]);
         }
     }
 
@@ -327,7 +330,8 @@ public class TeamsFragment extends Fragment {
             try {
                 ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
                 for (int a = 0; a < data.length; a++) {
-                    data[a][i] = psda.data.array[a];
+                    if(psda.data.array[a] != null && psda.data.array[a].get() != null)
+                        data[a][i] = psda.data.array[a];
                 }
             }catch (Exception e){
                 e.printStackTrace();
@@ -347,7 +351,8 @@ public class TeamsFragment extends Fragment {
             tv.setTextSize(30);
             binding.matchArea.addView(tv);
 
-            match_latest_values[i].add_history_view(binding.matchArea, data[i]);
+            if(data[i] != null)
+                match_latest_values[i].add_history_view(binding.matchArea, data[i]);
         }
     }
 }
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/CSVExport.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/CSVExport.java
index 9113f8b..81af2fb 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/CSVExport.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/CSVExport.java
@@ -70,7 +70,7 @@ public class CSVExport {
                     data += tempData;
                 } catch (Exception e){
                     e.printStackTrace();
-                    data += ("null,".repeat(pit_latest_values.length));
+                    data += ("null,".repeat(match_latest_values.length));
                 }
 
             }