fix: catch crash of fg service (#669)

2025-01-04 16:22:20 +08:00
parent 0bbd0b43b3
commit 7f58237589
40 changed files with 497 additions and 272 deletions
--- a/android/app/src/main/kotlin/tech/lolli/toolbox/ForegroundService.kt
+++ b/android/app/src/main/kotlin/tech/lolli/toolbox/ForegroundService.kt
@@ -5,10 +5,24 @@ import android.content.Intent
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
+import java.io.File
+import java.util.*

 class ForegroundService : Service() {
    private val chanId = "ForegroundServiceChannel"

+    private fun logError(message: String, error: Throwable? = null) {
+        Log.e("ForegroundService", message, error)
+        try {
+            val logFile = File(getExternalFilesDir(null), "server_box.log")
+            val timestamp = java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date())
+            val logMessage = "$timestamp [ForegroundService] ERROR: $message\n${error?.stackTraceToString() ?: ""}\n"
+            logFile.appendText(logMessage)
+        } catch (e: Exception) {
+            Log.e("ForegroundService", "Failed to write log", e)
+        }
+    }
+
    override fun onCreate() {
        super.onCreate()
        Log.d("ForegroundService", "Service onCreate")
@@ -16,25 +30,52 @@ class ForegroundService : Service() {
    }

    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (intent == null) {
-            Log.w("ForegroundService", "onStartCommand called with null intent")
-            stopForegroundService()
-            return START_NOT_STICKY
-        }
-
-        val action = intent.action
-        Log.d("ForegroundService", "onStartCommand action=$action")
-
-        return when (action) {
-            "ACTION_STOP_FOREGROUND" -> {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+                androidx.core.content.ContextCompat.checkSelfPermission(
+                    this, android.Manifest.permission.POST_NOTIFICATIONS
+                ) != android.content.pm.PackageManager.PERMISSION_GRANTED
+            ) {
+                Log.w("ForegroundService", "Notification permission denied. Stopping service.")
                stopForegroundService()
-                START_NOT_STICKY
+                return START_NOT_STICKY
            }
-            else -> {
-                val notification = createNotification()
+
+            if (intent == null) {
+                Log.w("ForegroundService", "onStartCommand called with null intent")
+                stopForegroundService()
+                return START_NOT_STICKY
+            }
+
+            val action = intent.action
+            Log.d("ForegroundService", "onStartCommand action=$action")
+
+            // Create notification before starting foreground
+            val notification = createNotification()
+            
+            // Use try-catch for startForeground
+            try {
                startForeground(1, notification)
-                START_STICKY
+            } catch (e: Exception) {
+                logError("Failed to start foreground", e)
+                stopSelf()
+                return START_NOT_STICKY
            }
+
+            return when (action) {
+                "ACTION_STOP_FOREGROUND" -> {
+                    stopForegroundService()
+                    START_NOT_STICKY
+                }
+                else -> {
+                    START_STICKY
+                }
+            }
+            
+        } catch (e: Exception) {
+            logError("Error in onStartCommand", e)
+            stopSelf()
+            return START_NOT_STICKY
        }
    }

@@ -61,44 +102,53 @@ class ForegroundService : Service() {
    }

    private fun createNotification(): Notification {
-        val notificationIntent = Intent(this, MainActivity::class.java)
-        val pendingIntent = PendingIntent.getActivity(
-            this,
-            0,
-            notificationIntent,
-            PendingIntent.FLAG_IMMUTABLE
-        )
+        try {
+            val notificationIntent = Intent(this, MainActivity::class.java)
+            val pendingIntent = PendingIntent.getActivity(
+                this,
+                0,
+                notificationIntent,
+                PendingIntent.FLAG_IMMUTABLE
+            )

-        val deleteIntent = Intent(this, ForegroundService::class.java).apply {
-            action = "ACTION_STOP_FOREGROUND"
+            val deleteIntent = Intent(this, ForegroundService::class.java).apply {
+                action = "ACTION_STOP_FOREGROUND"
+            }
+            val deletePendingIntent = PendingIntent.getService(
+                this,
+                0,
+                deleteIntent,
+                PendingIntent.FLAG_IMMUTABLE
+            )
+
+            val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                Notification.Builder(this, chanId)
+            } else {
+                Notification.Builder(this)
+            }
+
+            return builder
+                .setContentTitle("Server Box")
+                .setContentText("Running in background")
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .setContentIntent(pendingIntent)
+                .addAction(android.R.drawable.ic_delete, "Stop", deletePendingIntent)
+                .build()
+        } catch (e: Exception) {
+            logError("Error creating notification", e)
+            // Return a basic notification as fallback
+            return Notification.Builder(this)
+                .setContentTitle("Server Box")
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .build()
        }
-        val deletePendingIntent = PendingIntent.getService(
-            this,
-            0,
-            deleteIntent,
-            PendingIntent.FLAG_IMMUTABLE
-        )
-
-        val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            Notification.Builder(this, chanId)
-        } else {
-            Notification.Builder(this)
-        }
-
-        return builder
-            .setContentTitle("Server Box")
-            .setContentText("Running in background")
-            .setSmallIcon(R.mipmap.ic_launcher)
-            .setContentIntent(pendingIntent)
-            .addAction(android.R.drawable.ic_delete, "Stop", deletePendingIntent)
-            .build()
    }

    private fun stopForegroundService() {
        try {
            stopForeground(true)
        } catch (e: Exception) {
-            Log.e("ForegroundService", "Error stopping foreground: ${e.message}")
+            logError("Error stopping foreground", e)
        }
        stopSelf()
        Log.d("ForegroundService", "ForegroundService stopped")
--- a/android/app/src/main/kotlin/tech/lolli/toolbox/MainActivity.kt
+++ b/android/app/src/main/kotlin/tech/lolli/toolbox/MainActivity.kt
@@ -25,12 +25,19 @@ class MainActivity: FlutterFragmentActivity() {
                        result.success(null)
                    }
                    "startService" -> {
-                        reqPerm()
-                        val serviceIntent = Intent(this@MainActivity, ForegroundService::class.java)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                            startForegroundService(serviceIntent)
-                        } else {
-                            startService(serviceIntent)
+                        try {
+                            reqPerm()
+                            val serviceIntent = Intent(this@MainActivity, ForegroundService::class.java)
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                startForegroundService(serviceIntent)
+                            } else {
+                                startService(serviceIntent)
+                            }
+                            result.success(null)
+                        } catch (e: Exception) {
+                            // Log error but don't crash
+                            android.util.Log.e("MainActivity", "Failed to start service: ${e.message}")
+                            result.error("SERVICE_ERROR", e.message, null)
                        }
                    }
                    "stopService" -> {
@@ -54,13 +61,20 @@ class MainActivity: FlutterFragmentActivity() {

    private fun reqPerm() {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
+        
+        // Check if we already have the permission to avoid unnecessary prompts
        if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
            != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(
-                this,
-                arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                123,
-            )
+            try {
+                ActivityCompat.requestPermissions(
+                    this,
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    123,
+                )
+            } catch (e: Exception) {
+                // Log error but don't crash
+                android.util.Log.e("MainActivity", "Failed to request permissions: ${e.message}")
+            }
        }
    }
 }
--- a/android/app/src/main/kotlin/tech/lolli/toolbox/widget/HomeWidget.kt
+++ b/android/app/src/main/kotlin/tech/lolli/toolbox/widget/HomeWidget.kt
@@ -65,6 +65,8 @@ class HomeWidget : AppWidgetProvider() {
            views.setViewVisibility(R.id.error_message, View.VISIBLE)
            views.setTextViewText(R.id.error_message, "Please configure the widget URL.")
            views.setViewVisibility(R.id.widget_content, View.GONE)
+            views.setFloat(R.id.widget_name, "setAlpha", 1f)
+            views.setFloat(R.id.error_message, "setAlpha", 1f)
            appWidgetManager.updateAppWidget(appWidgetId, views)
            return
        } else {
@@ -100,6 +102,12 @@ class HomeWidget : AppWidgetProvider() {
                        views.setTextViewText(R.id.widget_net, net)
                        val timeStr = android.text.format.DateFormat.format("HH:mm", java.util.Date()).toString()
                        views.setTextViewText(R.id.widget_time, timeStr)
+                        views.setFloat(R.id.widget_name, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_cpu_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_mem_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_disk_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_net_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_time, "setAlpha", 1f)
                        appWidgetManager.updateAppWidget(appWidgetId, views)
                    }
                } else {
@@ -113,6 +121,8 @@ class HomeWidget : AppWidgetProvider() {
                    views.setViewVisibility(R.id.error_message, View.VISIBLE)
                    views.setTextViewText(R.id.error_message, "Failed to retrieve data.")
                    views.setViewVisibility(R.id.widget_content, View.GONE)
+                    views.setFloat(R.id.widget_name, "setAlpha", 1f)
+                    views.setFloat(R.id.error_message, "setAlpha", 1f)
                    appWidgetManager.updateAppWidget(appWidgetId, views)
                }
            }
--- a/android/app/src/main/res/layout/home_widget.xml
+++ b/android/app/src/main/res/layout/home_widget.xml
@@ -16,6 +16,8 @@
        android:textSize="23sp"
        android:textStyle="bold"
        android:maxLines="1"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
        tools:text="Server Name" />

    <!-- Wrap the content in a LinearLayout for easy visibility management -->
@@ -32,7 +34,8 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:gravity="center_vertical"
-            android:paddingTop="13dp">
+            android:paddingTop="13dp"
+            android:animateLayoutChanges="true">

            <LinearLayout
                android:id="@+id/widget_cpu_label"
@@ -155,6 +158,8 @@
        android:textColor="@color/widgetSummaryText"
        android:textSize="12sp"
        android:visibility="gone"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
        tools:text="Error message" />

    <TextView
@@ -165,6 +170,8 @@
        android:maxLines="2"
        android:textColor="@color/widgetSummaryText"
        android:textSize="11sp"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
        tools:text="UpdateTime" />

 </RelativeLayout>