Also declare special use foreground service

Fate-Grand-Automata · Aug 12, 2024 · b0565d8 · b0565d8
1 parent 0d27085
commit b0565d8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
  <uses-permission android:name="android.permission.VIBRATE" />
  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -24,7 +25,10 @@
 
  <service
  android:name=".runner.ScriptRunnerService"
- android:foregroundServiceType="mediaProjection" />
+ android:foregroundServiceType="mediaProjection|specialUse">
+ <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+ android:value="Shows a Play button in front of apps in landscape mode so farming can be started while Fate/Grand Order is open."/>
+ </service>
 
  <service
  android:name=".accessibility.TapperService"

diff --git a/app/src/main/java/io/github/fate_grand_automata/imaging/MediaProjectionScreenshotService.kt b/app/src/main/java/io/github/fate_grand_automata/imaging/MediaProjectionScreenshotService.kt
@@ -32,7 +32,7 @@ class MediaProjectionScreenshotService(
 
  @SuppressLint("WrongConstant")
  private val imageReader = ImageReader.newInstance(imageSize.width, imageSize.height, PixelFormat.RGBA_8888, 2)
- private val virtualDisplay = mediaProjection.apply {
+ private val virtualDisplay: VirtualDisplay? = mediaProjection.apply {
  this.registerCallback(object : MediaProjection.Callback() {
  override fun onStop() {
  close()
@@ -74,13 +74,16 @@ class MediaProjectionScreenshotService(
  }
 
  override fun close() {
+ if (virtualDisplay == null) {
+ return
+ }
  bufferMat.release()
  grayscaleMat.release()
  grayscalePattern.close()
  colorMat.release()
  colorPattern.close()
 
- virtualDisplay.release()
+ virtualDisplay?.release()
 
  imageReader.close()
 

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
@@ -103,6 +103,9 @@ class ScriptRunnerNotification @Inject constructor(
  .setOngoing(true)
  .setContentTitle(service.getString(R.string.app_name))
  .setContentText(service.getString(R.string.overlay_notification_text))
+ // show full message on expand
+ .setStyle(NotificationCompat.BigTextStyle()
+ .bigText(service.getString(R.string.overlay_notification_text)))
  .setSmallIcon(R.mipmap.notification_icon)
  .setColor(service.getColor(R.color.colorBusterWeak))
  .setPriority(NotificationManager.IMPORTANCE_LOW)
@@ -117,7 +120,7 @@ class ScriptRunnerNotification @Inject constructor(
  service.startForeground(
  Ids.foregroundNotification,
  builder.build(),
- ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION
+ ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE or ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION
  )
  } else {
  service.startForeground(

diff --git a/app/src/main/res/values/localized.xml b/app/src/main/res/values/localized.xml
@@ -211,7 +211,7 @@ Copy or rename it if you want to keep it."</string>
  <string name="p_support_class_berserker">"Berserker"</string>
  <string name="p_support_class_extra">"Extra"</string>
  <string name="p_support_class_mix">"Mix"</string>
- <string name="overlay_notification_text">"Overlay service running"</string>
+ <string name="overlay_notification_text">"The FGA service is currently running to show the Play button and to take screenshots if needed."</string>
  <string name="notification_stop">"Stop"</string>
  <string name="accessibility_service">"Accessibility Service: "</string>
  <string name="accessibility_enabled">"ENABLED"</string>