From 4ecb3f7d70e89f939921ce4dd82560f43ea3ef21 Mon Sep 17 00:00:00 2001 From: cyberarm Date: Tue, 10 Nov 2020 13:48:40 -0600 Subject: [PATCH] Updates, fixed crash when packet handler was handling listConfigs where the list of configs was empty --- .../TimeCraftersConfigurationTool/MainActivity.java | 6 ++---- .../TimeCraftersConfigurationTool/backend/TAC.java | 4 ++-- .../tacnet/PacketHandler.java | 10 ++++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java index b327ba4..802f8bf 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java @@ -1,20 +1,18 @@ package org.timecrafters.TimeCraftersConfigurationTool; -import android.app.Notification; -import android.app.PendingIntent; import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.util.Log; -import com.google.android.material.bottomnavigation.BottomNavigationView; - import androidx.appcompat.app.AppCompatActivity; import androidx.navigation.NavController; import androidx.navigation.Navigation; import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.NavigationUI; +import com.google.android.material.bottomnavigation.BottomNavigationView; + import org.timecrafters.TimeCraftersConfigurationTool.backend.Backend; import org.timecrafters.TimeCraftersConfigurationTool.backend.TAC; import org.timecrafters.TimeCraftersConfigurationTool.tacnet.TACNETServerService; diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/TAC.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/TAC.java index f0f7a2d..65fd167 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/TAC.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/TAC.java @@ -14,6 +14,6 @@ public class TAC { // Set COMPETITION_MODE to true to disable automatic TACNET server start public static final boolean BUILD_COMPETITION_MODE = false; - public static final boolean BUILD_AUTO_START = true; - public static final String BUILD_AUTO_START_MODEL = "pixel";// "rev hub"; /* LOWERCASE */ + public static final boolean BUILD_AUTO_START = false; + public static final String BUILD_AUTO_START_MODEL = "rev hub"; /* LOWERCASE */ } diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/tacnet/PacketHandler.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/tacnet/PacketHandler.java index aa24e7f..285b2ed 100755 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/tacnet/PacketHandler.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/tacnet/PacketHandler.java @@ -67,6 +67,11 @@ public class PacketHandler { return; } + case SELECT_CONFIG: { + handleSelectConfig(packet); + return; + } + case ADD_CONFIG: { handleAddConfig(packet); return; @@ -145,6 +150,11 @@ public class PacketHandler { ArrayList diff = Backend.instance().configsList(); for (String part : remoteConfigs) { + // Don't crash if configs list is empty + if (part == null || part.length() == 0) { + continue; + } + final String[] configInfo = part.split(",", 2); final String name = configInfo[0]; final int revision = Integer.parseInt(configInfo[1]);