bump: v1256

fix: notification permission (#914 )
fix: version code err caused by Flutter (#913 )
2026-02-15 04:34:34 +01:00 · 2025-09-15 02:35:42 +08:00 · 2025-09-14 22:34:01 +08:00 · 2025-09-14 14:23:17 +08:00
7 changed files with 134 additions and 61 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,7 +113,7 @@ android.applicationVariants.all { variant ->
  variant.outputs.each { output ->
    def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
    if (abiVersionCode != null) {
-      output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
+      output.versionCodeOverride = variant.versionCode * 100 + abiVersionCode
    }
  }
 }
--- a/android/app/src/main/kotlin/tech/lolli/toolbox/ForegroundService.kt
+++ b/android/app/src/main/kotlin/tech/lolli/toolbox/ForegroundService.kt
@@ -2,6 +2,8 @@ package tech.lolli.toolbox

 import android.app.*
 import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.graphics.drawable.Icon
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
@@ -48,19 +50,22 @@ class ForegroundService : Service() {

    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        try {
+            // Check notification permission for Android 13+
            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()
+                Log.w("ForegroundService", "Notification permission denied. Stopping service gracefully.")
+                // Don't call stopForegroundService() here as we haven't started foreground yet
+                stopSelf()
                return START_NOT_STICKY
            }

            if (intent == null) {
                Log.w("ForegroundService", "onStartCommand called with null intent")
-                stopForegroundService()
+                // Don't call stopForegroundService() here as we haven't started foreground yet
+                stopSelf()
                return START_NOT_STICKY
            }

@@ -101,33 +106,62 @@ class ForegroundService : Service() {

    private fun createNotificationChannel() {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(NotificationManager::class.java)
-            if (manager == null) {
-                Log.e("ForegroundService", "Failed to get NotificationManager")
-                return
+            try {
+                val manager = getSystemService(NotificationManager::class.java)
+                if (manager == null) {
+                    Log.e("ForegroundService", "Failed to get NotificationManager")
+                    return
+                }
+                val serviceChannel = NotificationChannel(
+                    chanId,
+                    "ForegroundServiceChannel",
+                    NotificationManager.IMPORTANCE_DEFAULT
+                ).apply {
+                    description = "For foreground service"
+                }
+                manager.createNotificationChannel(serviceChannel)
+                Log.d("ForegroundService", "Notification channel created successfully")
+            } catch (e: Exception) {
+                logError("Failed to create notification channel", e)
            }
-            val serviceChannel = NotificationChannel(
-                chanId,
-                "ForegroundServiceChannel",
-                NotificationManager.IMPORTANCE_DEFAULT
-            ).apply {
-                description = "For foreground service"
-            }
-            manager.createNotificationChannel(serviceChannel)
        }
    }

    private fun ensureForeground(notification: Notification) {
        try {
+            // Double-check notification permission before starting foreground service
+            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", "Cannot start foreground service without notification permission")
+                stopSelf()
+                return
+            }
+
            if (!isFgStarted) {
-                startForeground(NOTIFICATION_ID, notification)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+                } else {
+                    startForeground(NOTIFICATION_ID, notification)
+                }
                isFgStarted = true
+                Log.d("ForegroundService", "Foreground service started successfully")
            } else {
                val nm = getSystemService(NotificationManager::class.java)
-                nm?.notify(NOTIFICATION_ID, notification)
+                if (nm != null) {
+                    nm.notify(NOTIFICATION_ID, notification)
+                } else {
+                    Log.w("ForegroundService", "NotificationManager is null, cannot update notification")
+                }
            }
+        } catch (e: SecurityException) {
+            logError("Security exception when starting foreground service (likely missing permission)", e)
+            stopSelf()
        } catch (e: Exception) {
            logError("Failed to start/update foreground", e)
+            // Don't stop the service for other exceptions, just log them
        }
    }

@@ -143,21 +177,22 @@ class ForegroundService : Service() {
        val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            Notification.Builder(this, chanId)
        } else {
+            @Suppress("DEPRECATION")
            Notification.Builder(this)
        }

        // Use the earliest session's start time for chronometer
        val earliestStartTime = sessions.minOfOrNull { it.startWhen } ?: System.currentTimeMillis()

-        val title = when {
-            count == 0 -> "Server Box"
-            count == 1 -> sessions.first().title
+        val title = when (count) {
+            0 -> "Server Box"
+            1 -> sessions.first().title
            else -> "SSH sessions: $count active"
        }

-        val contentText = when {
-            count == 0 -> "Ready for connections"
-            count == 1 -> {
+        val contentText = when (count) {
+            0 -> "Ready for connections"
+            1 -> {
                val session = sessions.first()
                "${session.subtitle} · ${session.status}"
            }
@@ -189,7 +224,13 @@ class ForegroundService : Service() {
            .setOngoing(true)
            .setOnlyAlertOnce(true)
            .setContentIntent(pendingIntent)
-            .addAction(android.R.drawable.ic_delete, "Stop All", stopPending)
+            .addAction(
+                Notification.Action.Builder(
+                    Icon.createWithResource(this, android.R.drawable.ic_delete),
+                    "Stop All",
+                    stopPending
+                ).build()
+            )

        if (style != null) {
            notification.setStyle(style)
@@ -260,7 +301,10 @@ class ForegroundService : Service() {

    private fun stopForegroundService() {
        try {
-            stopForeground(true)
+            if (isFgStarted) {
+                stopForeground(STOP_FOREGROUND_REMOVE)
+                isFgStarted = false
+            }
        } catch (e: Exception) {
            logError("Error stopping foreground", e)
        }
--- a/android/app/src/main/kotlin/tech/lolli/toolbox/MainActivity.kt
+++ b/android/app/src/main/kotlin/tech/lolli/toolbox/MainActivity.kt
@@ -105,19 +105,24 @@ 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) {
-            try {
+        try {
+            // Check if we already have the permission to avoid unnecessary prompts
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
+                != PackageManager.PERMISSION_GRANTED) {
+                // Check if we should show rationale
+                if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.POST_NOTIFICATIONS)) {
+                    android.util.Log.i("MainActivity", "User previously denied notification permission")
+                }
+                
                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}")
            }
+        } catch (e: Exception) {
+            // Log error but don't crash
+            android.util.Log.e("MainActivity", "Failed to request permissions: ${e.message}")
        }
    }

@@ -163,13 +168,37 @@ class MainActivity: FlutterFragmentActivity() {
            }
        }
        val filter = IntentFilter(ACTION_STOP_ALL_CONNECTIONS)
-        registerReceiver(stopAllReceiver, filter)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            ContextCompat.registerReceiver(this, stopAllReceiver, filter, ContextCompat.RECEIVER_NOT_EXPORTED)
+        } else {
+            registerReceiver(stopAllReceiver, filter)
+        }
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (requestCode == 123) {
+            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                android.util.Log.i("MainActivity", "Notification permission granted")
+            } else {
+                android.util.Log.w("MainActivity", "Notification permission denied")
+                // Optionally inform user about the limitation
+            }
+        }
    }

    override fun onDestroy() {
        super.onDestroy()
        stopAllReceiver?.let {
-            unregisterReceiver(it)
+            try {
+                unregisterReceiver(it)
+            } catch (e: Exception) {
+                android.util.Log.e("MainActivity", "Failed to unregister receiver: ${e.message}")
+            }
            stopAllReceiver = null
        }
    }
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -748,7 +748,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -758,7 +758,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -884,7 +884,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -894,7 +894,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -912,7 +912,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -922,7 +922,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -943,7 +943,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -956,7 +956,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
@@ -982,7 +982,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -995,7 +995,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1018,7 +1018,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1031,7 +1031,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1054,7 +1054,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1066,7 +1066,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
@@ -1095,7 +1095,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1107,7 +1107,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;
@@ -1133,7 +1133,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1145,7 +1145,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;
--- a/lib/data/res/build_data.dart
+++ b/lib/data/res/build_data.dart
@@ -3,6 +3,6 @@

 abstract class BuildData {
  static const String name = "ServerBox";
-  static const int build = 1253;
+  static const int build = 1256;
  static const int script = 69;
 }
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -471,7 +471,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
@@ -481,7 +481,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "Server Box";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -608,7 +608,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
@@ -618,7 +618,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "Server Box";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -638,7 +638,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1253;
+				CURRENT_PROJECT_VERSION = 1256;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -649,7 +649,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.1253;
+				MARKETING_VERSION = 1.0.1256;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "Server Box";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: server_box
 description: server status & toolbox app.
 publish_to: "none"
-version: 1.0.1253+1253
+version: 1.0.1256+1256

 environment:
  sdk: ">=3.9.0"
Author	SHA1	Message	Date
lollipopkit🏳️‍⚧️	17db393c12	bump: v1256	2025-09-15 02:35:42 +08:00
lollipopkit🏳️‍⚧️	275581cfa3	fix: notification permission (#914 )	2025-09-14 22:34:01 +08:00
lollipopkit🏳️‍⚧️	d7168ea1ff	fix: version code err caused by Flutter (#913 )	2025-09-14 14:23:17 +08:00