up 2.0.9

Update libs.versions.toml
Improve accessibility: mark decorative icons across remaining layouts (#5265 )
2026-02-07 11:06:16 +08:00 · 2026-02-07 11:05:47 +08:00 · 2026-02-07 10:46:10 +08:00 · 2026-02-07 10:42:19 +08:00
24 changed files with 52 additions and 23 deletions
@@ -12,8 +12,8 @@ android {
        applicationId = "com.v2ray.ang"
        minSdk = 24
        targetSdk = 36
-        versionCode = 708
-        versionName = "2.0.8"
+        versionCode = 709
+        versionName = "2.0.9"
        multiDexEnabled = true

        val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
@@ -41,6 +41,7 @@ class AngApplication : MultiDexApplication() {
        WorkManager.initialize(this, workManagerConfiguration)

        SettingsManager.initRoutingRulesets(this)
+        SettingsManager.migrateHysteria2PinSHA256()

        es.dmoral.toasty.Toasty.Config.getInstance()
            .setGravity(android.view.Gravity.BOTTOM, 0, 200)
@@ -124,7 +124,7 @@ data class ProfileItem(
                && this.obfsPassword == obj.obfsPassword
                && this.portHopping == obj.portHopping
                && this.portHoppingInterval == obj.portHoppingInterval
-                && this.pinSHA256 == obj.pinSHA256
+                && this.pinnedCA256 == obj.pinnedCA256
                )
    }
 }
@@ -44,7 +44,7 @@ object Hysteria2Fmt : FmtBase() {
            if (config.portHopping.isNotNullEmpty()) {
                config.portHoppingInterval = queryParam["mportHopInt"]
            }
-            config.pinSHA256 = queryParam["pinSHA256"]
+            config.pinnedCA256 = queryParam["pinSHA256"]

        }

@@ -75,8 +75,8 @@ object Hysteria2Fmt : FmtBase() {
        if (config.portHoppingInterval.isNotNullEmpty()) {
            dicQuery["mportHopInt"] = config.portHoppingInterval.orEmpty()
        }
-        if (config.pinSHA256.isNotNullEmpty()) {
-            dicQuery["pinSHA256"] = config.pinSHA256.orEmpty()
+        if (config.pinnedCA256.isNotNullEmpty()) {
+            dicQuery["pinSHA256"] = config.pinnedCA256.orEmpty()
        }

        return toUri(config, config.password, dicQuery)
@@ -16,6 +16,7 @@ import com.v2ray.ang.enums.Language
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.enums.RoutingType
 import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.dto.ServersCache
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.enums.VpnInterfaceAddressConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
@@ -422,4 +423,30 @@ object SettingsManager {
            MmkvManager.encodeSettings(key, default)
        }
    }
+
+    fun migrateHysteria2PinSHA256() {
+        // Check if migration has already been done
+        val migrationKey = "hysteria2_pin_sha256_migrated"
+        if (MmkvManager.decodeSettingsBool(migrationKey, false)) {
+            return
+        }
+
+        val serverList = decodeServerList()
+
+        for (guid in serverList) {
+            val profile = decodeServerConfig(guid) ?: continue
+            if (profile.configType != EConfigType.HYSTERIA2) {
+                continue
+            }
+            if (profile.pinSHA256.isNullOrEmpty() || !profile.pinnedCA256.isNullOrEmpty()) {
+                continue
+            }
+            profile.pinnedCA256 = profile.pinSHA256
+            profile.pinSHA256 = null
+            MmkvManager.encodeServerConfig(guid, profile)
+        }
+
+        MmkvManager.encodeSettings(migrationKey, true)
+    }
+
 }
@@ -129,7 +129,6 @@ class ServerActivity : BaseActivity() {
    private val et_obfs_password: EditText? by lazy { findViewById(R.id.et_obfs_password) }
    private val et_port_hop: EditText? by lazy { findViewById(R.id.et_port_hop) }
    private val et_port_hop_interval: EditText? by lazy { findViewById(R.id.et_port_hop_interval) }
-    private val et_pinsha256: EditText? by lazy { findViewById(R.id.et_pinsha256) }
    private val et_bandwidth_down: EditText? by lazy { findViewById(R.id.et_bandwidth_down) }
    private val et_bandwidth_up: EditText? by lazy { findViewById(R.id.et_bandwidth_up) }
    private val et_extra: EditText? by lazy { findViewById(R.id.et_extra) }
@@ -367,7 +366,6 @@ class ServerActivity : BaseActivity() {
            et_obfs_password?.text = Utils.getEditable(config.obfsPassword)
            et_port_hop?.text = Utils.getEditable(config.portHopping)
            et_port_hop_interval?.text = Utils.getEditable(config.portHoppingInterval)
-            et_pinsha256?.text = Utils.getEditable(config.pinSHA256)
            et_bandwidth_down?.text = Utils.getEditable(config.bandwidthDown)
            et_bandwidth_up?.text = Utils.getEditable(config.bandwidthUp)
        }
@@ -536,7 +534,6 @@ class ServerActivity : BaseActivity() {
            config.obfsPassword = et_obfs_password?.text?.toString()
            config.portHopping = et_port_hop?.text?.toString()
            config.portHoppingInterval = et_port_hop_interval?.text?.toString()
-            config.pinSHA256 = et_pinsha256?.text?.toString()
            config.bandwidthDown = et_bandwidth_down?.text?.toString()
            config.bandwidthUp = et_bandwidth_up?.text?.toString()
        }
@@ -75,6 +75,7 @@
                        <ImageView
                            android:layout_width="@dimen/image_size_dp24"
                            android:layout_height="@dimen/image_size_dp24"
+                            android:importantForAccessibility="no"
                            app:srcCompat="@drawable/ic_about_24dp" />

                    </LinearLayout>
@@ -22,6 +22,7 @@
            <ImageView
                android:layout_width="@dimen/image_size_dp24"
                android:layout_height="@dimen/image_size_dp24"
+                android:importantForAccessibility="no"
                app:srcCompat="@drawable/ic_source_code_24dp" />

            <androidx.appcompat.widget.SwitchCompat
@@ -49,6 +50,7 @@
            <ImageView
                android:layout_width="@dimen/image_size_dp24"
                android:layout_height="@dimen/image_size_dp24"
+                android:importantForAccessibility="no"
                app:srcCompat="@drawable/ic_check_update_24dp" />

            <TextView
@@ -11,6 +11,7 @@
        android:id="@+id/iv_qcode"
        android:layout_width="336dp"
        android:layout_height="336dp"
+        android:contentDescription="@string/title_qr_code"
        android:scaleType="fitXY"
        app:srcCompat="@drawable/ic_fab_check" />
 </LinearLayout>
@@ -43,6 +43,7 @@
                    android:layout_height="@dimen/padding_spacing_dp16"
                    android:layout_gravity="center"
                    android:layout_marginStart="@dimen/padding_spacing_dp16"
+                    android:importantForAccessibility="no"
                    app:srcCompat="@drawable/ic_lock_24dp" />

            </LinearLayout>
@@ -87,6 +88,7 @@
                <ImageView
                    android:layout_width="@dimen/image_size_dp24"
                    android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                    app:srcCompat="@drawable/ic_edit_24dp" />
            </LinearLayout>

@@ -67,6 +67,7 @@
                        <ImageView
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/image_size_dp24"
+                            android:importantForAccessibility="no"
                            app:srcCompat="@drawable/ic_share_24dp" />

                    </LinearLayout>
@@ -85,6 +86,7 @@
                        <ImageView
                            android:layout_width="@dimen/image_size_dp24"
                            android:layout_height="@dimen/image_size_dp24"
+                            android:importantForAccessibility="no"
                            app:srcCompat="@drawable/ic_edit_24dp" />

                    </LinearLayout>
@@ -103,6 +105,7 @@
                        <ImageView
                            android:layout_width="@dimen/image_size_dp24"
                            android:layout_height="@dimen/image_size_dp24"
+                            android:importantForAccessibility="no"
                            app:srcCompat="@drawable/ic_delete_24dp" />

                    </LinearLayout>
@@ -64,6 +64,7 @@
            <ImageView
                android:layout_width="@dimen/image_size_dp24"
                android:layout_height="@dimen/image_size_dp24"
+                android:importantForAccessibility="no"
                app:srcCompat="@drawable/ic_edit_24dp" />
        </LinearLayout>

@@ -79,6 +80,7 @@
            <ImageView
                android:layout_width="@dimen/image_size_dp24"
                android:layout_height="@dimen/image_size_dp24"
+                android:importantForAccessibility="no"
                app:srcCompat="@drawable/ic_delete_24dp" />
        </LinearLayout>
    </LinearLayout>
@@ -80,10 +80,10 @@
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="@string/server_lab_stream_pinsha256" />
+                android:text="@string/server_lab_pinned_ca256" />

            <EditText
-                android:id="@+id/et_pinsha256"
+                android:id="@+id/et_pinned_ca256"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:inputType="text" />
@@ -18,6 +18,7 @@
            android:id="@+id/image_switch"
            android:layout_width="45dp"
            android:layout_height="45dp"
+            android:importantForAccessibility="no"
            android:padding="@dimen/padding_spacing_dp16"
            app:srcCompat="@drawable/ic_stat_name" />
    </LinearLayout>
@@ -109,7 +109,6 @@
    <string name="server_obfs_password">Obfs password</string>
    <string name="server_lab_port_hop">Port Hopping</string>
    <string name="server_lab_port_hop_interval">Port Hopping Interval</string>
-    <string name="server_lab_stream_pinsha256">pinSHA256</string>
    <string name="server_lab_bandwidth_down">Bandwidth down (Supported units: k/m/g/t)</string>
    <string name="server_lab_bandwidth_up">Bandwidth up (Supported units: k/m/g/t)</string>
    <string name="server_lab_xhttp_mode">XHTTP Mode</string>
@@ -108,7 +108,6 @@
    <string name="server_obfs_password">Obfs password</string>
    <string name="server_lab_port_hop">Port Hopping</string>
    <string name="server_lab_port_hop_interval">Port Hopping Interval</string>
-    <string name="server_lab_stream_pinsha256">pinSHA256</string>
    <string name="server_lab_bandwidth_down">Bandwidth down (Supported units: k/m/g/t)</string>
    <string name="server_lab_bandwidth_up">Bandwidth up (Supported units: k/m/g/t)</string>
    <string name="server_lab_xhttp_mode">XHTTP Mode</string>
@@ -108,7 +108,6 @@
    <string name="server_obfs_password">رزم obfs</string>
    <string name="server_lab_port_hop">پورت گوم (درگا سرورن ز نۊ هؽل اکونه)</string>
    <string name="server_lab_port_hop_interval">فاسله پورت گوم (سانیه)</string>
-    <string name="server_lab_stream_pinsha256">pinSHA256</string>
    <string name="server_lab_bandwidth_down">ب لم ٱووڌن پئنا باند (واهڌ)</string>
    <string name="server_lab_bandwidth_up">وا روء رئڌن پئنا باند (واهڌ)</string>
    <string name="server_lab_xhttp_mode">هالت XHTTP</string>
@@ -108,7 +108,6 @@
    <string name="server_obfs_password">رمز عبور obfs</string>
    <string name="server_lab_port_hop">پورت پرش (درگاه سرور را بازنویسی می کند)</string>
    <string name="server_lab_port_hop_interval">فاصله پورت پرش (ثانیه)</string>
-    <string name="server_lab_stream_pinsha256">pinSHA256</string>
    <string name="server_lab_bandwidth_down">کاهش پهنای باند (واحد)</string>
    <string name="server_lab_bandwidth_up">افزایش پهنای باند (واحد)</string>
    <string name="server_lab_xhttp_mode">حالت XHTTP</string>
@@ -108,7 +108,6 @@
    <string name="server_obfs_password">Пароль obfs</string>
    <string name="server_lab_port_hop">Смена портов (переопределяет порт)</string>
    <string name="server_lab_port_hop_interval">Интервал смены портов</string>
-    <string name="server_lab_stream_pinsha256">pinSHA256</string>
    <string name="server_lab_bandwidth_down">Входящая пропускная способность (допускаются: k/m/g/t)</string>
    <string name="server_lab_bandwidth_up">Исходящая пропускная способность (допускаются: k/m/g/t)</string>
    <string name="server_lab_xhttp_mode">Режим XHTTP</string>
@@ -108,7 +108,6 @@
    <string name="server_obfs_password">Obfs password</string>
    <string name="server_lab_port_hop">Port Hopping</string>
    <string name="server_lab_port_hop_interval">Port Hopping Interval</string>
-    <string name="server_lab_stream_pinsha256">pinSHA256</string>
    <string name="server_lab_bandwidth_down">Bandwidth down (Supported units: k/m/g/t)</string>
    <string name="server_lab_bandwidth_up">Bandwidth up (Supported units: k/m/g/t)</string>
    <string name="server_lab_xhttp_mode">XHTTP Mode</string>
@@ -108,7 +108,6 @@
    <string name="server_obfs_password">混淆密码</string>
    <string name="server_lab_port_hop">跳跃端口 (会覆盖服务器端口)</string>
    <string name="server_lab_port_hop_interval">端口跳跃间隔 (秒)</string>
-    <string name="server_lab_stream_pinsha256">SHA256 证书指纹</string>
    <string name="server_lab_bandwidth_down">带宽下行 (支持的单位 k/m/g/t)</string>
    <string name="server_lab_bandwidth_up">带宽上行 (支持的单位 k/m/g/t)</string>
    <string name="server_lab_xhttp_mode">XHTTP 模式</string>
@@ -108,7 +108,6 @@
    <string name="server_obfs_password">混淆密碼</string>
    <string name="server_lab_port_hop">跳躍連接埠 (會覆蓋伺服器連接埠)</string>
    <string name="server_lab_port_hop_interval">連接埠跳躍間隔 (秒)</string>
-    <string name="server_lab_stream_pinsha256">SHA256 憑證指紋</string>
    <string name="server_lab_bandwidth_down">頻寬下行 (支持的單位 k/m/g/t)</string>
    <string name="server_lab_bandwidth_up">頻寬上行 (支持的單位 k/m/g/t)</string>
    <string name="server_lab_xhttp_mode">XHTTP 模式</string>
@@ -109,7 +109,6 @@
    <string name="server_obfs_password">Obfs password</string>
    <string name="server_lab_port_hop">Port Hopping(will override the port)</string>
    <string name="server_lab_port_hop_interval">Port Hopping Interval</string>
-    <string name="server_lab_stream_pinsha256">pinSHA256</string>
    <string name="server_lab_bandwidth_down">Bandwidth down (Supported units: k/m/g/t)</string>
    <string name="server_lab_bandwidth_up">Bandwidth up (Supported units: k/m/g/t)</string>
    <string name="server_lab_xhttp_mode">XHTTP Mode</string>
@@ -244,6 +243,7 @@
    <string name="summary_pref_tg_group">Join Telegram Group</string>
    <string name="toast_tg_app_not_found">Telegram app not found</string>
    <string name="title_privacy_policy">Privacy policy</string>
+    <string name="title_qr_code">QR code</string>
    <string name="title_about">About</string>
    <string name="title_source_code">Source code</string>
    <string name="title_oss_license">Open Source licenses</string>
@@ -2,14 +2,14 @@
 agp = "9.0.0"
 desugarJdkLibs = "2.1.5"
 gradleLicensePlugin = "0.9.8"
-kotlin = "2.3.0"
+kotlin = "2.3.10"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 appcompat = "1.7.1"
 material = "1.13.0"
-activity = "1.12.2"
+activity = "1.12.3"
 constraintlayout = "2.2.1"
 mmkvStatic = "1.3.16"
 gson = "2.13.2"
@@ -21,7 +21,7 @@ swiperefreshlayout = "1.2.0"
 toasty = "1.5.2"
 editorkit = "2.9.0"
 core = "3.5.4"
-workRuntimeKtx = "2.11.0"
+workRuntimeKtx = "2.11.1"
 lifecycleViewmodelKtx = "2.10.0"
 multidex = "2.0.1"
 mockitoMockitoInline = "5.2.0"
Author	SHA1	Message	Date
2dust	f9f0c905a4	up 2.0.9	2026-02-07 11:06:16 +08:00
2dust	f997335113	Update libs.versions.toml	2026-02-07 11:05:47 +08:00
AmirMohammad Yazdanmanesh	ed344cd281	Improve accessibility: mark decorative icons across remaining layouts (#5265 ) Add importantForAccessibility="no" to decorative ImageViews in check update, bypass list, routing, subscription, user asset, and widget layouts. Add contentDescription to QR code ImageView.	2026-02-07 10:46:10 +08:00
2dust	94775f120a	Migrate Hysteria2 pinSHA256 to pinnedCA256 Rename and migrate Hysteria2 certificate pin field from pinSHA256 to pinnedCA256 across code and UI, and add a one-time migration at startup. Changes: - Added SettingsManager.migrateHysteria2PinSHA256() and call in AngApplication to copy existing profile.pinSHA256 -> profile.pinnedCA256 and clear the old field, guarded by a migration flag. - Updated Hysteria2Fmt to read/write the query param "pinSHA256" into the new ProfileItem.pinnedCA256 field. - Updated ProfileItem equality to compare pinnedCA256 instead of pinSHA256. - Removed the old EditText binding and reads/writes for et_pinsha256 in ServerActivity; UI now uses et_pinned_ca256 (layout id renamed). - Updated layout and string resources: renamed the label/id to reflect pinned_ca256 and removed legacy pinSHA256 string entries in several locale files. This ensures existing Hysteria2 profiles keep their pin data while the code and UI use the new field name.	2026-02-07 10:42:19 +08:00