up 1.10.25

Add APPLICATION_ID to the About page

.github/workflows/build.yml

@@ -153,7 +153,7 @@ jobs:
       uses: svenstaro/upload-release-action@v2
       if: github.event.inputs.release_tag != ''
       with:
-        file: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*playstore*/release/*.apk
+        file: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*.apk
         tag: ${{ github.event.inputs.release_tag }}
         file_glob: true
         prerelease: true

V2rayNG/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.v2ray.ang"
         minSdk = 21
         targetSdk = 35
-        versionCode = 673
-        versionName = "1.10.23"
+        versionCode = 676
+        versionName = "1.10.25"
         multiDexEnabled = true
 
         val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')

V2rayNG/app/src/fdroid/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">v2rayNG (F-Droid)</string>
+</resources>

V2rayNG/app/src/fdroid/res/xml/shortcuts.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_qu_switch_24dp"
+        android:shortcutDisabledMessage="@string/app_widget_name"
+        android:shortcutId="shortcuts_switch"
+        android:shortcutLongLabel="@string/app_widget_name"
+        android:shortcutShortLabel="@string/app_widget_name">
+
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="com.v2ray.ang.ui.ScSwitchActivity"
+            android:targetPackage="com.v2ray.ang.fdroid" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_qu_scan_24dp"
+        android:shortcutDisabledMessage="@string/menu_item_import_config_qrcode"
+        android:shortcutId="shortcuts_scan"
+        android:shortcutLongLabel="@string/menu_item_import_config_qrcode"
+        android:shortcutShortLabel="@string/menu_item_import_config_qrcode">
+
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="com.v2ray.ang.ui.ScScannerActivity"
+            android:targetPackage="com.v2ray.ang.fdroid" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>

V2rayNG/app/src/main/AndroidManifest.xml

@@ -195,8 +195,8 @@
                 android:resource="@xml/app_widget_provider" />
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="com.v2ray.ang.action.widget.click" />
-                <action android:name="com.v2ray.ang.action.activity" />
+                <action android:name="${applicationId}.action.widget.click" />
+                <action android:name="${applicationId}.action.activity" />
             </intent-filter>
         </receiver>
         <receiver

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

@@ -75,9 +75,9 @@ object AppConfig {
     const val PROTOCOL_FREEDOM = "freedom"
 
     /** Broadcast actions. */
-    const val BROADCAST_ACTION_SERVICE = "com.v2ray.ang.action.service"
-    const val BROADCAST_ACTION_ACTIVITY = "com.v2ray.ang.action.activity"
-    const val BROADCAST_ACTION_WIDGET_CLICK = "com.v2ray.ang.action.widget.click"
+    const val BROADCAST_ACTION_SERVICE = "$ANG_PACKAGE.action.service"
+    const val BROADCAST_ACTION_ACTIVITY = "$ANG_PACKAGE.action.activity"
+    const val BROADCAST_ACTION_WIDGET_CLICK = "$ANG_PACKAGE.action.widget.click"
 
     /** Tasker extras. */
     const val TASKER_EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE"

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt

@@ -122,7 +122,7 @@ object ShadowsocksFmt : FmtBase() {
     fun toUri(config: ProfileItem): String {
         val pw = "${config.method}:${config.password}"
 
-        return toUri(config, Utils.encode(pw), null)
+        return toUri(config, Utils.encode(pw, true), null)
     }
 
     /**

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt

@@ -51,7 +51,7 @@ object SocksFmt : FmtBase() {
             else
                 ":"
 
-        return toUri(config, Utils.encode(pw), null)
+        return toUri(config, Utils.encode(pw, true), null)
     }
 
     /**

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

@@ -100,8 +100,19 @@ object UpdateCheckerManager {
     }
 
     private fun getDownloadUrl(release: GitHubRelease, abi: String): String {
-        return release.assets.find { it.name.contains(abi) }?.browserDownloadUrl
-            ?: release.assets.firstOrNull()?.browserDownloadUrl
+        val fDroid = "fdroid"
+
+        val assetsByAbi = release.assets.filter {
+            (it.name.contains(abi, true))
+        }
+
+        val asset = if (BuildConfig.APPLICATION_ID.contains(fDroid, ignoreCase = true)) {
+            assetsByAbi.firstOrNull { it.name.contains(fDroid) }
+        } else {
+            assetsByAbi.firstOrNull { !it.name.contains(fDroid) }
+        }
+
+        return asset?.browserDownloadUrl
             ?: throw IllegalStateException("No compatible APK found")
     }
 }

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

@@ -623,17 +623,16 @@ object V2rayConfigManager {
 
             // DNS routing
             v2rayConfig.routing.rules.add(
-                0, RulesBean(
-                    outboundTag = AppConfig.TAG_PROXY,
-                    inboundTag = arrayListOf(AppConfig.TAG_DNS),
+                RulesBean(
+                    outboundTag = AppConfig.TAG_DIRECT,
+                    inboundTag = arrayListOf(AppConfig.TAG_DOMESTIC_DNS),
                     domain = null
                 )
             )
-
             v2rayConfig.routing.rules.add(
-                0, RulesBean(
-                    outboundTag = AppConfig.TAG_DIRECT,
-                    inboundTag = arrayListOf(AppConfig.TAG_DOMESTIC_DNS),
+                RulesBean(
+                    outboundTag = AppConfig.TAG_PROXY,
+                    inboundTag = arrayListOf(AppConfig.TAG_DNS),
                     domain = null
                 )
             )

V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt

@@ -127,6 +127,9 @@ class AboutActivity : BaseActivity() {
         "v${BuildConfig.VERSION_NAME} (${SpeedtestManager.getLibVersion()})".also {
             binding.tvVersion.text = it
         }
+        BuildConfig.APPLICATION_ID.also {
+            binding.tvAppId.text = it
+        }
     }
 
     private fun backupConfiguration(outputZipFilePos: String): Pair<Boolean, String> {

V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt

@@ -134,11 +134,16 @@ object Utils {
      * Encode a string to base64.
      *
      * @param text The string to encode.
+     * @param removePadding
      * @return The base64 encoded string, or an empty string if encoding fails.
      */
-    fun encode(text: String): String {
+    fun encode(text: String, removePadding : Boolean = false): String {
         return try {
-            Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
+            var encoded = Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
+            if (removePadding) {
+                encoded = encoded.trimEnd('=')
+            }
+            encoded
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to encode text to base64", e)
             ""

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

@@ -236,7 +236,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:orientation="horizontal"
+                android:orientation="vertical"
                 android:padding="@dimen/padding_spacing_dp16">
 
                 <TextView
@@ -245,6 +245,13 @@
                     android:layout_height="wrap_content"
                     android:text="@string/title_about"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+                <TextView
+                    android:id="@+id/tv_app_id"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/title_about"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
             </LinearLayout>
 
         </LinearLayout>

V2rayNG/gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-agp = "8.12.2"
+agp = "8.12.3"
 desugarJdkLibs = "2.1.5"
 gradleLicensePlugin = "0.9.8"
-kotlin = "2.2.10"
+kotlin = "2.2.20"
 coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 appcompat = "1.7.1"
-material = "1.12.0"
+material = "1.13.0"
 activity = "1.10.1"
 constraintlayout = "2.2.1"
 mmkvStatic = "1.3.14"
@@ -20,8 +20,8 @@ swiperefreshlayout = "1.1.0"
 toasty = "1.5.2"
 editorkit = "2.9.0"
 core = "3.5.3"
-workRuntimeKtx = "2.10.3"
-lifecycleViewmodelKtx = "2.9.2"
+workRuntimeKtx = "2.10.5"
+lifecycleViewmodelKtx = "2.9.4"
 multidex = "2.0.1"
 mockitoMockitoInline = "5.2.0"
 flexbox = "3.0.0"