Fix service restart for Android 10 and below

Fate-Grand-Automata · Aug 19, 2024 · 102018a · 102018a
1 parent 9691afe
commit 102018a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/io/github/fate_grand_automata/runner/ScreenshotServiceHolder.kt b/app/src/main/java/io/github/fate_grand_automata/runner/ScreenshotServiceHolder.kt
@@ -56,7 +56,7 @@ class ScreenshotServiceHolder @Inject constructor(
  val mediaProjection =
  mediaProjectionManager.getMediaProjection(Activity.RESULT_OK, token)
 
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
  // not allowed to reuse tokens on Android 14
  ScriptRunnerService.mediaProjectionToken = null
  }

diff --git a/app/src/main/java/io/github/fate_grand_automata/runner/ScriptRunnerNotification.kt b/app/src/main/java/io/github/fate_grand_automata/runner/ScriptRunnerNotification.kt
@@ -116,7 +116,7 @@ class ScriptRunnerNotification @Inject constructor(
  fun show(useRootForScreenshots: Boolean) {
  val builder = startBuildNotification()
 
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
  var foregroundServiceType = ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
  if (!useRootForScreenshots) {
  foregroundServiceType = foregroundServiceType.or(ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION)

diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/main/MainScreen.kt b/app/src/main/java/io/github/fate_grand_automata/ui/main/MainScreen.kt
@@ -197,10 +197,12 @@ private fun toggleOverlayService(
  if (vm.prefs.wantsMediaProjectionToken) {
  if (ScriptRunnerService.mediaProjectionToken == null) {
  startMediaProjection()
+ return
  }
- } else {
- ScriptRunnerService.startService(context)
  }
+
+ // if we already have a token or are using root mode
+ ScriptRunnerService.startService(context)
  }
 }