up 2.0.10

https://github.com/2dust/v2rayNG/issues/5267

V2rayNG/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.v2ray.ang"
         minSdk = 24
         targetSdk = 36
-        versionCode = 709
-        versionName = "2.0.9"
+        versionCode = 710
+        versionName = "2.0.10"
         multiDexEnabled = true
 
         val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')

V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt

@@ -44,7 +44,7 @@ class AngApplication : MultiDexApplication() {
         SettingsManager.migrateHysteria2PinSHA256()
 
         es.dmoral.toasty.Toasty.Config.getInstance()
-            .setGravity(android.view.Gravity.BOTTOM, 0, 200)
+            .setGravity(android.view.Gravity.BOTTOM, 0, 300)
             .apply()
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/NotificationManager.kt

@@ -9,6 +9,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.os.Build
+import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import com.v2ray.ang.AppConfig
@@ -30,6 +31,7 @@ object NotificationManager {
     private const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
     private const val NOTIFICATION_PENDING_INTENT_RESTART_V2RAY = 2
     private const val NOTIFICATION_ICON_THRESHOLD = 3000
+    private const val QUERY_INTERVAL_MS = 3000L
 
     private var lastQueryTime = 0L
     private var mBuilder: NotificationCompat.Builder? = null
@@ -44,7 +46,6 @@ object NotificationManager {
         if (MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) != true) return
         if (speedNotificationJob != null || V2RayServiceManager.isRunning() == false) return
 
-        lastQueryTime = System.currentTimeMillis()
         var lastZeroSpeed = false
         val outboundTags = currentConfig?.getAllOutboundTags()
         outboundTags?.remove(AppConfig.TAG_DIRECT)
@@ -52,7 +53,17 @@ object NotificationManager {
         speedNotificationJob = CoroutineScope(Dispatchers.IO).launch {
             while (isActive) {
                 val queryTime = System.currentTimeMillis()
-                val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
+                val sinceLastQueryIn = (queryTime - lastQueryTime)
+
+                // If the query interval is too short, skip this round to avoid excessive CPU usage
+                if (sinceLastQueryIn < QUERY_INTERVAL_MS) {
+                    Log.w(AppConfig.TAG, "Query interval too short: ${sinceLastQueryIn}ms, skipping")
+                    lastQueryTime = queryTime
+                    delay(QUERY_INTERVAL_MS)
+                    continue
+                }
+                val sinceLastQueryInSeconds = sinceLastQueryIn / 1000.0
+
                 var proxyTotal = 0L
                 val text = StringBuilder()
                 outboundTags?.forEach {
@@ -78,7 +89,7 @@ object NotificationManager {
                 }
                 lastZeroSpeed = zeroSpeed
                 lastQueryTime = queryTime
-                delay(3000)
+                delay(QUERY_INTERVAL_MS)
             }
         }
     }
@@ -89,6 +100,10 @@ object NotificationManager {
      */
     fun showNotification(currentConfig: ProfileItem?) {
         val service = getService() ?: return
+
+        // Reset last query time to avoid querying stats too soon after showing the notification
+        lastQueryTime = System.currentTimeMillis()
+
         val flags = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
 
         val startMainIntent = Intent(service, MainActivity::class.java)

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt

@@ -776,13 +776,14 @@ object V2rayConfigManager {
                 || protocol.equals(EConfigType.TROJAN.name, true)
                 || protocol.equals(EConfigType.WIREGUARD.name, true)
                 || protocol.equals(EConfigType.HYSTERIA2.name, true)
+                || protocol.equals(EConfigType.HYSTERIA.name, true)
             ) {
                 muxEnabled = false
             } else if (outbound.streamSettings?.network == NetworkType.XHTTP.type) {
                 muxEnabled = false
             }
 
-            if (muxEnabled == true) {
+            if (muxEnabled) {
                 outbound.mux?.enabled = true
                 outbound.mux?.concurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_CONCURRENCY, "8").orEmpty().toInt()
                 outbound.mux?.xudpConcurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "16").orEmpty().toInt()

V2rayNG/app/src/main/res/layout/preference_with_help_link.xml

@@ -8,4 +8,5 @@
     android:text="@string/title_mode_help"
     android:textAlignment="textStart"
     android:textStyle="italic"
+    android:textColor="?attr/colorPrimary"
     tools:ignore="UsingOnClickInXml" />

V2rayNG/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "9.0.0"
+agp = "9.0.1"
 desugarJdkLibs = "2.1.5"
 gradleLicensePlugin = "0.9.8"
 kotlin = "2.3.10"
@@ -9,7 +9,7 @@ junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 appcompat = "1.7.1"
 material = "1.13.0"
-activity = "1.12.3"
+activity = "1.12.4"
 constraintlayout = "2.2.1"
 mmkvStatic = "1.3.16"
 gson = "2.13.2"

V2rayNG/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Nov 14 12:42:51 BDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists