From 0460f2b61dc4dec437a33a785fa4aad982465978 Mon Sep 17 00:00:00 2001
From: Wang Syutung <wangxudong@sar.tw.cn>
Date: Tue, 1 Sep 2026 11:20:43 +0800
Subject: [PATCH 1/2] feat(notification): update notification to support
 Android live updates

- Add POST_PROMOTED_NOTIFICATIONS permission for Android 17+ support
- Update targetSdk from 35 to 36
- Bump app version from 2.11.33 to 2.11.34
- Add setRequestPromotedOngoing and setStyle configuration to notification builder
- Add critical text to display download speed for notifications
- Update Gradle wrapper from 8.10.2 to 8.11.1
- Upgrade AGP from 8.8.0 to 8.9.1
- Upgrade core-ktx from 1.8.0 to 1.17.0
- Add permission annotations and required imports for notification updates
---
 app/src/main/AndroidManifest.xml              |  1 +
 build.gradle.kts                              |  6 +++---
 gradle.properties                             |  2 +-
 gradle/libs.versions.toml                     |  4 ++--
 gradle/wrapper/gradle-wrapper.properties      |  5 +++--
 .../clash/module/DynamicNotificationModule.kt | 20 ++++++++++++++++---
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9900007e38..84f9251436 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         tools:ignore="QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_PROMOTED_NOTIFICATIONS" />
 
     <!-- Workaround for Android 17+ cross profile loopback networking restrictions.
          This permission allows CMFA to connect to loopback addresses and ports bound
diff --git a/build.gradle.kts b/build.gradle.kts
index 1229e5ab24..c6d00ba266 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,10 +56,10 @@ subprojects {
             }
 
             minSdk = 21
-            targetSdk = 35
+            targetSdk = 36
 
-            versionName = "2.11.33"
-            versionCode = 211033
+            versionName = "2.11.34"
+            versionCode = 211034
 
             resValue("string", "release_name", "v$versionName")
             resValue("integer", "release_code", "$versionCode")
diff --git a/gradle.properties b/gradle.properties
index c853a1f81e..7d106cc498 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,4 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Gradle parallel build
-org.gradle.parallel=true
\ No newline at end of file
+org.gradle.parallel=trueorg.gradle.java.home=/opt/homebrew/Cellar/openjdk@21/21.0.12.1/libexec/openjdk.jdk/Contents/Home
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3190850eff..6ef35f9025 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-agp = "8.8.0"
+agp = "8.9.1"
 kotlin = "2.1.0"
 ksp = "2.1.0-1.0.29"
 golang = "1.0.4"
 coroutine = "1.10.1"
-coreKtx = "1.8.0"
+coreKtx = "1.17.0"
 activity = "1.5.0"
 fragment = "1.5.0"
 appcompat = "1.4.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b4eae46630..765f0faa3b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Tue Jan 14 14:06:42 CST 2025
+#Tue Sep 01 10:42:18 CST 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt b/service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt
index 43aa3d6596..1f03dd9b17 100644
--- a/service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt
@@ -1,12 +1,18 @@
 package com.github.kr328.clash.service.clash.module
 
+import android.Manifest
 import android.app.PendingIntent
 import android.app.Service
 import android.content.Intent
+import android.content.pm.ShortcutInfo
+import android.content.res.Resources
+import android.os.Build
 import android.os.PowerManager
+import androidx.annotation.RequiresPermission
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.getSystemService
+import androidx.core.content.pm.ShortcutInfoCompat
 import com.github.kr328.clash.common.compat.getColorCompat
 import com.github.kr328.clash.common.compat.pendingIntentFlags
 import com.github.kr328.clash.common.constants.Components
@@ -30,6 +36,8 @@ class DynamicNotificationModule(service: Service) : Module<Unit>(service) {
         .setOnlyAlertOnce(true)
         .setShowWhen(false)
         .setContentTitle("Not Selected")
+        .setRequestPromotedOngoing(true)
+        .setStyle(NotificationCompat.BigTextStyle())
         .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
         .setContentIntent(
             PendingIntent.getActivity(
@@ -43,6 +51,7 @@ class DynamicNotificationModule(service: Service) : Module<Unit>(service) {
 
     private val notificationManager = NotificationManagerCompat.from(service)
 
+    @RequiresPermission(Manifest.permission.POST_NOTIFICATIONS)
     private fun update() {
         val now = Clash.queryTrafficNow()
         val total = Clash.queryTrafficTotal()
@@ -64,8 +73,9 @@ class DynamicNotificationModule(service: Service) : Module<Unit>(service) {
                     R.string.clash_notification_content,
                     uploaded, downloaded
                 )
-            )
-            .build()
+            ).setShortCriticalText(
+                "$downloaded ↓"
+            ).build()
 
         notificationManager.notify(R.id.nf_clash_status, notification)
     }
@@ -95,10 +105,14 @@ class DynamicNotificationModule(service: Service) : Module<Unit>(service) {
                     }
                 }
                 profileLoaded.onReceive {
+                    builder.setContentTitle("Clash Meta")
+                    builder.setSmallIcon(R.drawable.ic_logo_service)
+                    builder.setOngoing(true)
+
                     builder.setContentTitle(StatusProvider.currentProfile ?: "Not selected")
                 }
                 if (shouldUpdate) {
-                    ticker.onReceive {
+                    ticker.onReceive @androidx.annotation.RequiresPermission(android.Manifest.permission.POST_NOTIFICATIONS) {
                         update()
                     }
                 }

From aa00253482cdea0524b0c84192485e5f08918b7b Mon Sep 17 00:00:00 2001
From: Wang Syutung <wangxudong@sar.tw.cn>
Date: Tue, 1 Sep 2026 11:55:43 +0800
Subject: [PATCH 2/2] fix(notification): Fix the download speed display issue
 in the dynamic notification module

- Corrected the text "downloaded data amount" in the notification to "downloading speed"
- Fixed the display anomaly caused by incorrect variable name
---
 .../clash/service/clash/module/DynamicNotificationModule.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt b/service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt
index 1f03dd9b17..db8a4592f0 100644
--- a/service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/clash/module/DynamicNotificationModule.kt
@@ -74,7 +74,7 @@ class DynamicNotificationModule(service: Service) : Module<Unit>(service) {
                     uploaded, downloaded
                 )
             ).setShortCriticalText(
-                "$downloaded ↓"
+                "$downloading ↓"
             ).build()
 
         notificationManager.notify(R.id.nf_clash_status, notification)