From cda2c90807c8a27aae7c16e5109977366c93c02b Mon Sep 17 00:00:00 2001 From: cyberarm Date: Wed, 8 Dec 2021 10:30:52 -0600 Subject: [PATCH] Process is no longer bad --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 3 +-- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 12 ------------ app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 15 +++++++++++---- .../LauncherActivity.java | 5 ----- .../backend/TAC.java | 8 +++----- .../dialogs/PermissionsRequestDialog.java | 2 +- 9 files changed, 19 insertions(+), 31 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 23a89bb..2c7e034 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 61f4772..3bc5697 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -39,7 +39,7 @@ - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ba6832c..3957b22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,6 +26,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation 'com.google.code.gson:gson:2.8.6' + implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6d97b08..6d952f7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,7 +4,6 @@ package="org.timecrafters.TimeCraftersConfigurationTool"> - @@ -22,11 +21,13 @@ + android:exported="false" + android:permission="android.permission.WRITE_EXTERNAL_STORAGE" /> + android:exported="false" + android:permission="android.permission.WRITE_EXTERNAL_STORAGE"/> - + + + diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/LauncherActivity.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/LauncherActivity.java index f6981ca..9d59d71 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/LauncherActivity.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/LauncherActivity.java @@ -2,19 +2,14 @@ package org.timecrafters.TimeCraftersConfigurationTool; import android.Manifest; import android.content.Intent; -import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.util.Log; -import android.view.View; -import android.widget.Button; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; -import com.google.android.material.bottomnavigation.BottomNavigationView; - import org.timecrafters.TimeCraftersConfigurationTool.backend.Backend; import org.timecrafters.TimeCraftersConfigurationTool.dialogs.PermissionsRequestDialog; 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 8a91054..0c612b3 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/TAC.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/backend/TAC.java @@ -15,13 +15,11 @@ 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 = false; - public static final String BUILD_AUTO_START_MODEL = "rev hub"; /* LOWERCASE */ + public static final boolean BUILD_AUTO_START = true; static public boolean allowAutoServerStart() { return !TAC.BUILD_COMPETITION_MODE && - ((TAC.BUILD_AUTO_START && - Build.MODEL.toLowerCase().contains(TAC.BUILD_AUTO_START_MODEL)) || - (Backend.instance() != null && Backend.instance().getSettings().mobileStartServerAtBoot)); + TAC.BUILD_AUTO_START || + Backend.instance() != null && Backend.instance().getSettings().mobileStartServerAtBoot; } } diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/PermissionsRequestDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/PermissionsRequestDialog.java index 760f2c8..c73a98c 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/PermissionsRequestDialog.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/PermissionsRequestDialog.java @@ -24,7 +24,7 @@ public class PermissionsRequestDialog extends TimeCraftersDialog { ((TextView)root.findViewById(R.id.dialog_title)).setText("Storage Permission Required"); LinearLayout view = root.findViewById(R.id.dialog_content); view.addView(getLayoutInflater().inflate(R.layout.dialog_permission_request, null)); - ((TextView)view.findViewById(R.id.message)).setText("Permission is required to write to external storage:\n\n" + TAC.ROOT_PATH); + ((TextView)view.findViewById(R.id.message)).setText("Permission is required to access external storage:\n\n" + TAC.ROOT_PATH); Button quitButton = view.findViewById(R.id.quit_button); Button continueButton = view.findViewById(R.id.continue_button);