Chore: bump version

build.gradle.kts

@@ -40,8 +40,8 @@ subprojects {
             minSdk = 21
             targetSdk = 31
 
-            versionName = "2.5.8"
-            versionCode = 205008
+            versionName = "2.5.9"
+            versionCode = 205009
 
             resValue("string", "release_name", "v$versionName")
             resValue("integer", "release_code", "$versionCode")

core/src/main/golang/native/log_open.go

@@ -25,7 +25,7 @@ func init() {
 		defer log.UnSubscribe(sub)
 
 		for item := range sub {
-			msg := item.(*log.Event)
+			msg := item.(log.Event)
 
 			cPayload := C.CString(msg.Payload)
 
@@ -52,7 +52,7 @@ func subscribeLogcat(remote unsafe.Pointer) {
 		defer log.UnSubscribe(sub)
 
 		for i := range sub {
-			msg, ok := i.(*log.Event)
+			msg, ok := i.(log.Event)
 			if !ok {
 				continue
 			}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=a9a7b7baba105f6557c9dcf9c3c6e8f7e57e6b49889c5f1d133f015d0727e4be
+distributionSha256Sum=e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82

service/src/main/java/com/github/kr328/clash/service/clash/module/AppListCacheModule.kt

@@ -15,7 +15,19 @@ class AppListCacheModule(service: Service) : Module<Unit>(service) {
 
     private fun reload() {
         val packages = service.packageManager.getInstalledPackages(0)
-            .map { it.applicationInfo.uid to it.uniqueUidName() }
+            .groupBy { it.uniqueUidName() }
+            .map { (_, v) ->
+                val info = v[0]
+
+                if (v.size == 1) {
+                    // Force use package name if only one app in a single sharedUid group
+                    // Example: firefox
+
+                    info.applicationInfo.uid to info.packageName
+                } else {
+                    info.applicationInfo.uid to info.uniqueUidName()
+                }
+            }
 
         Clash.notifyInstalledAppsChanged(packages)
 

settings.gradle.kts

@@ -18,7 +18,7 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            val agp = "7.1.3"
+            val agp = "7.2.0"
             val kotlin = "1.6.21"
             val ksp = "$kotlin-1.0.5"
             val golang = "1.0.4"
@@ -30,7 +30,7 @@ dependencyResolutionManagement {
             val coordinator = "1.2.0"
             val recyclerview = "1.2.1"
             val viewpager = "1.0.0"
-            val material = "1.5.0"
+            val material = "1.6.0"
             val appcenter = "4.4.3"
             val serialization = "1.3.2"
             val kaidl = "1.15"