TimeCrafters/TimeCraftersConfigurationTool
1
0
Fork 0
mirror of https://github.com/TimeCrafters/TimeCraftersConfigurationTool.git synced 2025-12-16 21:42:35 +00:00
Code Issues Projects Releases Wiki Activity

Updates, fixed crash when packet handler was handling listConfigs where the list of configs was empty

Browse Source
This commit is contained in:
cyberarm
2020-11-10 13:48:40 -06:00
parent 8f4bf8f7ae
commit 4ecb3f7d70
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java
View File

@@ -1,20 +1,18 @@
package org.timecrafters.TimeCraftersConfigurationTool; package org.timecrafters.TimeCraftersConfigurationTool;
import android.app.Notification;
import android.app.PendingIntent;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.navigation.NavController; import androidx.navigation.NavController;
import androidx.navigation.Navigation; import androidx.navigation.Navigation;
import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.AppBarConfiguration;
import androidx.navigation.ui.NavigationUI; import androidx.navigation.ui.NavigationUI;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import org.timecrafters.TimeCraftersConfigurationTool.backend.Backend; import org.timecrafters.TimeCraftersConfigurationTool.backend.Backend;
import org.timecrafters.TimeCraftersConfigurationTool.backend.TAC; import org.timecrafters.TimeCraftersConfigurationTool.backend.TAC;
import org.timecrafters.TimeCraftersConfigurationTool.tacnet.TACNETServerService; import org.timecrafters.TimeCraftersConfigurationTool.tacnet.TACNETServerService;

4
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/TAC.java
View File

@@ -14,6 +14,6 @@ public class TAC {
// Set COMPETITION_MODE to true to disable automatic TACNET server start // Set COMPETITION_MODE to true to disable automatic TACNET server start
public static final boolean BUILD_COMPETITION_MODE = false; public static final boolean BUILD_COMPETITION_MODE = false;
public static final boolean BUILD_AUTO_START = true; public static final boolean BUILD_AUTO_START = false;
public static final String BUILD_AUTO_START_MODEL = "pixel";// "rev hub"; /* LOWERCASE */ public static final String BUILD_AUTO_START_MODEL = "rev hub"; /* LOWERCASE */
} }

10
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/tacnet/PacketHandler.java
View File

@@ -67,6 +67,11 @@ public class PacketHandler {
return; return;
} }
case SELECT_CONFIG: {
handleSelectConfig(packet);
return;
}
case ADD_CONFIG: { case ADD_CONFIG: {
handleAddConfig(packet); handleAddConfig(packet);
return; return;
@@ -145,6 +150,11 @@ public class PacketHandler {
ArrayList<String> diff = Backend.instance().configsList(); ArrayList<String> diff = Backend.instance().configsList();
for (String part : remoteConfigs) { 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[] configInfo = part.split(",", 2);
final String name = configInfo[0]; final String name = configInfo[0];
final int revision = Integer.parseInt(configInfo[1]); final int revision = Integer.parseInt(configInfo[1]);