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

Fixed crash when autostarting TACNET Server Service from MainActivity due to android 8 prohibiting creating background services when app is not in foreground, refactored auto start constants.

Browse Source
This commit is contained in:
cyberarm
2020-11-10 11:11:48 -06:00
parent a8ec2d0956
commit 4a685cf9d9
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import org.timecrafters.TimeCraftersConfigurationTool.tacnet.TACNETServerService
public class MainActivity extends AppCompatActivity {
private static final String TAG = "MainActivity";
private static final String AUTO_START_MODEL = "pixel"; // "rev hub" /* LOWERCASE */
private AppBarConfiguration appBarConfiguration;
@Override
@@ -47,14 +46,18 @@ public class MainActivity extends AppCompatActivity {
Backend.instance().applicationContext = getApplicationContext();
// Auto start TACNET server if allowed and device model contains AUTO_START_MODEL
if (!TAC.COMPETITION_MODE && Backend.instance().getServer() == null && Build.MODEL.toLowerCase().contains(AUTO_START_MODEL)) {
Log.i(TAG, "Detected REV Robotics Control Hub, attempting to auto-start TACNET Server Service...");
if (!TAC.BUILD_COMPETITION_MODE && TAC.BUILD_AUTO_START && Backend.instance().getServer() == null &&
Build.MODEL.toLowerCase().contains(TAC.BUILD_AUTO_START_MODEL)) {
Log.i(TAG, "Detected " + Build.MANUFACTURER + " " + Build.MODEL + " (" + Build.HARDWARE + "), starting TACNET Server Service...");
startService(new Intent(this, TACNETServerService.class));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
startForegroundService(new Intent(this, TACNETServerService.class));
} else {
startService(new Intent(this, TACNETServerService.class));
}
}
if (getIntent().getBooleanExtra("navigate_to_tacnet", false)) {
Log.i(TAG, "Navigatingg to tacnet...");
Navigation.findNavController(this, R.id.nav_host_fragment).navigate(R.id.navigation_tacnet);
}
}

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

@@ -11,6 +11,9 @@ public class TAC {
SETTINGS_PATH = ROOT_PATH + File.separator + "settings.json";
public static final int CONFIG_SPEC_VERSION = 2;
// Set COMPETITION_MODE to true to disable automatic TACNET server start
public static final boolean COMPETITION_MODE = false;
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 */
}