avoid ANR with startForegroundService

YouROK · May 11, 2024 · 51dd4d7 · 51dd4d7
1 parent 5ef8eeb
commit 51dd4d7
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/app/src/main/java/ru/yourok/torrserve/server/local/TorrService.kt b/app/src/main/java/ru/yourok/torrserve/server/local/TorrService.kt
@@ -70,17 +70,17 @@ class TorrService : Service() {
         return START_NOT_STICKY
     }
 
-    private fun startServer(nfg: Boolean = false) {
+    private fun startServer(needForeground: Boolean = false) {
         serviceScope.launch {
-            if (BuildConfig.DEBUG) Log.d("TorrService", "startServer(nfg:$nfg)")
+            if (BuildConfig.DEBUG) Log.d("TorrService", "startServer(needForeground:$needForeground)")
 
             if (isLocal() && isAccessibilityOn() && !Accessibility.isEnabledService(App.context)) {
                 if (BuildConfig.DEBUG) Log.d("TorrService", "Try to enable AssessibilityService")
                 Accessibility.enableService(App.context, true)
             }
 
             if (serverFile.exists() && isLocal() && Api.echo().isEmpty()) {
-                if (nfg) { // fix start local server on boot
+                if (needForeground) { // fix start local server on boot
                     val builder = NotificationCompat.Builder(this@TorrService, NotificationTS().channelId)
                         .setSmallIcon(R.mipmap.ic_launcher)
                         .setContentTitle(getString(R.string.app_name))
@@ -131,7 +131,11 @@ class TorrService : Service() {
                 if (isLocal()) { // avoid ANR on remote
                     intent.putExtra(NEED_FOREGROUND_KEY, true)
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        context.startForegroundService(intent)
+                        try {
+                            context.startForegroundService(intent)
+                        } catch (_: Exception) {
+                            // need then call Service.startForeground() or ANR
+                        }
                     }
                 }
             }