up 1.9.20

Add OSS Licenses Plugin to Display Open Source Licenses (#4022 )
### Commit Message - Integrated Google OSS Licenses Plugin to display the licenses of third-party libraries used in the app. - Added the plugin to app-level Gradle file and included the required dependencies. - Created a pre-built activity (`OssLicensesMenuActivity`) to show the licenses, accessible via a button/menu. - Verified the implementation, ensuring the licenses are displayed correctly. - Tested on release builds to confirm functionality and compliance. This implementation ensures transparency and complies with open-source license requirements.
2024-11-24 19:50:03 +08:00 · 2024-11-23 20:04:37 +08:00 · 2024-11-23 10:25:21 +08:00 · 2024-11-23 09:52:02 +08:00 · 2024-11-21 20:30:35 +08:00 · 2024-11-21 20:24:01 +08:00
13 changed files with 98 additions and 16 deletions
--- a/V2rayNG/app/build.gradle.kts
+++ b/V2rayNG/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
    alias(libs.plugins.android.application)
    alias(libs.plugins.kotlin.android)
+    id("com.google.android.gms.oss-licenses-plugin")
 }

 android {
@@ -11,8 +12,8 @@ android {
        applicationId = "com.v2ray.ang"
        minSdk = 21
        targetSdk = 35
-        versionCode = 614
-        versionName = "1.9.18"
+        versionCode = 616
+        versionName = "1.9.20"
        multiDexEnabled = true

        splits {
@@ -145,4 +146,6 @@ dependencies {
    androidTestImplementation(libs.androidx.espresso.core)
    testImplementation(libs.org.mockito.mockito.inline)
    testImplementation(libs.mockito.kotlin)
+    // Oss Licenses
+    implementation(libs.play.services.oss.licenses)
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
@@ -102,6 +102,30 @@ object ShadowsocksFmt : FmtBase() {
            server.method = profileItem.method
        }

+        outboundBean?.streamSettings?.populateTransportSettings(
+            profileItem.network.orEmpty(),
+            profileItem.headerType,
+            profileItem.host,
+            profileItem.path,
+            profileItem.seed,
+            profileItem.quicSecurity,
+            profileItem.quicKey,
+            profileItem.mode,
+            profileItem.serviceName,
+            profileItem.authority,
+        )
+
+        outboundBean?.streamSettings?.populateTlsSettings(
+            profileItem.security.orEmpty(),
+            profileItem.insecure == true,
+            profileItem.sni,
+            profileItem.fingerPrint,
+            profileItem.alpn,
+            profileItem.publicKey,
+            profileItem.shortId,
+            profileItem.spiderX,
+        )
+
        return outboundBean
    }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
@@ -95,7 +95,7 @@ object SettingsManager {
        if (rulesetList.isNullOrEmpty()) return

        if (index < 0 || index >= rulesetList.count()) {
-            rulesetList.add(ruleset)
+            rulesetList.add(0, ruleset)
        } else {
            rulesetList[index] = ruleset
        }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt
@@ -10,6 +10,7 @@ import android.net.LocalSocketAddress
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
+import android.net.ProxyInfo
 import android.net.VpnService
 import android.os.Build
 import android.os.ParcelFileDescriptor
@@ -190,6 +191,7 @@ class V2RayVpnService : VpnService(), ServiceControl {

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
            builder.setMetered(false)
+            builder.setHttpProxy(ProxyInfo.buildDirectProxy(LOOPBACK, SettingsManager.getHttpPort()))
        }

        // Create a new interface using the builder and save the parameters.
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt
@@ -20,6 +20,8 @@ import com.v2ray.ang.util.ZipUtil
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Locale
+import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
+

 class AboutActivity : BaseActivity() {
    private val binding by lazy { ActivityAboutBinding.inflate(layoutInflater) }
@@ -87,6 +89,9 @@ class AboutActivity : BaseActivity() {
        binding.layoutFeedback.setOnClickListener {
            Utils.openUri(this, AppConfig.v2rayNGIssues)
        }
+        binding.layoutOssLicenses.setOnClickListener{
+            startActivity(Intent(this, OssLicensesMenuActivity::class.java))
+        }

        binding.layoutTgChannel.setOnClickListener {
            Utils.openUri(this, AppConfig.TgChannelUrl)
--- a/V2rayNG/app/src/main/res/drawable/license_24px.xml
+++ b/V2rayNG/app/src/main/res/drawable/license_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,520Q430,520 395,485Q360,450 360,400Q360,350 395,315Q430,280 480,280Q530,280 565,315Q600,350 600,400Q600,450 565,485Q530,520 480,520ZM240,920L240,611Q202,569 181,515Q160,461 160,400Q160,266 253,173Q346,80 480,80Q614,80 707,173Q800,266 800,400Q800,461 779,515Q758,569 720,611L720,920L480,840L240,920ZM480,640Q580,640 650,570Q720,500 720,400Q720,300 650,230Q580,160 480,160Q380,160 310,230Q240,300 240,400Q240,500 310,570Q380,640 480,640ZM320,801L480,760L640,801L640,677Q605,697 564.5,708.5Q524,720 480,720Q436,720 395.5,708.5Q355,697 320,677L320,801ZM480,739L480,739Q480,739 480,739Q480,739 480,739Q480,739 480,739Q480,739 480,739L480,739L480,739Z"/>
+</vector>
--- a/V2rayNG/app/src/main/res/layout/activity_about.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_about.xml
@@ -135,6 +135,30 @@
                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
            </LinearLayout>

+            <LinearLayout
+                android:id="@+id/layout_oss_licenses"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/server_height"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center|start"
+                android:orientation="horizontal"
+                android:padding="@dimen/padding">
+
+                <ImageView
+                    android:layout_width="@dimen/png_height"
+                    android:layout_height="@dimen/png_height"
+                    app:srcCompat="@drawable/license_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/padding_start"
+                    android:text="@string/title_oss_license"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </LinearLayout>
+
            <LinearLayout
                android:id="@+id/layout_feedback"
                android:layout_width="match_parent"
--- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
@@ -80,12 +80,12 @@
    <string name="server_lab_security4">نوم من توری (اختیاری)</string>
    <string name="server_lab_encryption">رزم نگاری</string>
    <string name="server_lab_flow">جریان</string>
-    <string name="server_lab_public_key">PublicKey</string>
+    <string name="server_lab_public_key">کیلیت پوی وولاتی</string>
    <string name="server_lab_short_id">ShortId</string>
    <string name="server_lab_spider_x">SpiderX</string>
-    <string name="server_lab_secret_key">SecretKey</string>
-    <string name="server_lab_reserved">Reserved(اختیاری, وا کاما ز یک جوڌا ابۊن)</string>
-    <string name="server_lab_local_address">آدرس مهلی (اختیاری IPv4/IPv6, وا کاما ز یک جوڌا ابۊن)</string>
+    <string name="server_lab_secret_key">کیلیت سیخومی</string>
+    <string name="server_lab_reserved">Reserved(اختیاری، وا کاما ز یک جوڌا ابۊن)</string>
+    <string name="server_lab_local_address">آدرس مهلی (اختیاری IPv4/IPv6، وا کاما ز یک جوڌا ابۊن)</string>
    <string name="server_lab_local_mtu">Mtu(اختیاری، خوتکار 1420)</string>
    <string name="toast_success">وا مووفقیت ٱنجوم وابی</string>
    <string name="toast_failure">شکست خرد</string>
@@ -217,8 +217,8 @@
    <string name="title_configuration_restore">وورگندن کانفیگ</string>
    <string name="title_configuration_share">یک رسۊوی کانفیگ</string>

-    <string name="title_pref_promotion">تبلیغات</string>
-    <string name="summary_pref_promotion">تبلیغات، سی نیشتن جوزیات بیشتر کیلیک کۊنین. (هیاری مالی کۊنین تا پاک بۊ)</string>
+    <string name="title_pref_promotion">تبلیقات</string>
+    <string name="summary_pref_promotion">تبلیقات، سی نیشتن جوزیات بیشتر کیلیک کۊنین. (هیاری مالی کۊنین تا پاک بۊ)</string>

    <string name="title_pref_auto_update_subscription">ورۊ کردن خوتکار اشتراکا</string>
    <string name="summary_pref_auto_update_subscription">اشتراکا خوتۉ ن و تۉر خوتکار وا فاسله زمۊوی من پس زمینه ورۊ کۊنین. ای ویژیی من پوی دسگایل گاشڌ همیشه کار نکونه</string>
@@ -262,7 +262,7 @@

    <string name="routing_settings_domain_strategy">نشقه دامنه</string>
    <string name="routing_settings_title">سامووا تور جوستن</string>
-    <string name="routing_settings_tips">وا کاما ز یک جوڌا ابۊن (,) پسند دامنه یا آی پی</string>
+    <string name="routing_settings_tips">وا کاما ز یک جوڌا ابۊن (،) پسند دامنه یا آی پی</string>
    <string name="routing_settings_save">زفت کردن</string>
    <string name="routing_settings_delete">روفتن</string>
    <string name="routing_settings_rule_title">سامووا قانۉݩ تور جوستن</string>
--- a/V2rayNG/app/src/main/res/values-fa/strings.xml
+++ b/V2rayNG/app/src/main/res/values-fa/strings.xml
@@ -79,10 +79,11 @@
    <string name="server_lab_security4">نام‌ کاربری (اختیاری)</string>
    <string name="server_lab_encryption">رمزنگاری</string>
    <string name="server_lab_flow">جریان</string>
-    <string name="server_lab_public_key">PublicKey</string>
+    <string name="server_lab_public_key">کلید عمومی</string>
+    <string name="server_lab_preshared_key">کلید رمزگذاری اضافی (اختیاری)</string>
    <string name="server_lab_short_id">ShortId</string>
    <string name="server_lab_spider_x">SpiderX</string>
-    <string name="server_lab_secret_key">SecretKey</string>
+    <string name="server_lab_secret_key">کلید خصوصی</string>
    <string name="server_lab_reserved">Reserved (اختیاری)</string>
    <string name="server_lab_local_address">آدرس محلی IPv4(اختیاری)</string>
    <string name="server_lab_local_mtu">Mtu(optional, default 1420)</string>
@@ -96,7 +97,7 @@
    <string name="server_customize_config">کانفیگ سفارشی</string>
    <string name="toast_config_file_invalid">کانفیگ معتبر نیست</string>
    <string name="server_lab_content">محتوا</string>
-    <string name="toast_none_data_clipboard">هیچ داده‌ای در کلیپ ‌بورد وجود ندارد</string>
+    <string name="toast_none_data_clipboard">هیچ داده‌ ای در کلیپ ‌بورد وجود ندارد</string>
    <string name="toast_invalid_url">نشانی اینترنتی معتبر نیست</string>
    <string name="toast_insecure_url_protocol">لطفاً از آدرس اشتراک پروتکل HTTP ناامن استفاده نکنید</string>
    <string name="server_lab_need_inbound">اطمینان حاصل کنید که پورت ورودی با تنظیمات مطابقت دارد</string>
--- a/V2rayNG/app/src/main/res/values-ru/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ru/strings.xml
@@ -80,6 +80,7 @@
    <string name="server_lab_encryption">Шифрование</string>
    <string name="server_lab_flow">Поток</string>
    <string name="server_lab_public_key">Открытый ключ</string>
+    <string name="server_lab_preshared_key">Дополнительный ключ шифрования (необязательно)</string>
    <string name="server_lab_short_id">ShortID</string>
    <string name="server_lab_spider_x">SpiderX</string>
    <string name="server_lab_secret_key">Закрытый ключ</string>
@@ -266,10 +267,10 @@
    <string name="routing_settings_delete">Очистить</string>
    <string name="routing_settings_rule_title">Настройка правил маршрутизации</string>
    <string name="routing_settings_add_rule">Добавить правило</string>
-    <string name="routing_settings_import_predefined_rulesets">Импорт предопределенных наборов правил</string>
+    <string name="routing_settings_import_predefined_rulesets">Импорт набора правил</string>
    <string name="routing_settings_import_rulesets_tip">Существующие правила будут удалены. Продолжить?</string>
    <string name="routing_settings_import_rulesets_from_clipboard">Импорт правил из буфера обмена</string>
-    <string name="routing_settings_import_rulesets_from_qrcode">Импорт набора правил из QRcode</string>
+    <string name="routing_settings_import_rulesets_from_qrcode">Импорт правил из QR-кода</string>
    <string name="routing_settings_export_rulesets_to_clipboard">Экспорт правил в буфер обмена</string>
    <string name="routing_settings_locked">Постоянное (сохранится при импорте правил)</string>
    <string name="routing_settings_domain">Домен</string>
--- a/V2rayNG/app/src/main/res/values/strings.xml
+++ b/V2rayNG/app/src/main/res/values/strings.xml
@@ -214,6 +214,7 @@
    <string name="title_privacy_policy">Privacy policy</string>
    <string name="title_about">About</string>
    <string name="title_source_code">Source code</string>
+    <string name="title_oss_license">Open Source licenses</string>
    <string name="title_tg_channel">Telegram channel</string>
    <string name="title_configuration_backup">Backup configuration</string>
    <string name="summary_configuration_backup">Storage location: [%s], The backup will be cleared after uninstalling the app or clearing the storage</string>
--- a/V2rayNG/build.gradle.kts
+++ b/V2rayNG/build.gradle.kts
@@ -3,4 +3,11 @@ plugins {
    alias(libs.plugins.android.application) apply false
    alias(libs.plugins.android.library) apply false
    alias(libs.plugins.kotlin.android) apply false
-}
+}
+
+buildscript {
+    dependencies {
+        classpath(libs.oss.licenses.plugin)
+    }
+}
+
--- a/V2rayNG/gradle/libs.versions.toml
+++ b/V2rayNG/gradle/libs.versions.toml
@@ -11,6 +11,8 @@ activity = "1.9.3"
 constraintlayout = "2.2.0"
 mmkvStatic = "1.3.9"
 gson = "2.11.0"
+ossLicensesPlugin = "0.10.6"
+playServicesOssLicenses = "17.1.0"
 rxjava = "3.1.9"
 rxandroid = "3.0.2"
 rxpermissions = "0.12"
@@ -36,6 +38,8 @@ androidx-activity = { group = "androidx.activity", name = "activity", version.re
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 mmkv-static = { module = "com.tencent:mmkv-static", version.ref = "mmkvStatic" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", version.ref = "ossLicensesPlugin" }
+play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" }
 rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" }
 rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" }
 rxpermissions = { module = "com.github.tbruyelle:rxpermissions", version.ref = "rxpermissions" }
Author	SHA1	Message	Date
2dust	f3abd0d9fc	up 1.9.20	2024-11-24 19:50:03 +08:00
Tamim Hossain	4a62aff7d2	Add OSS Licenses Plugin to Display Open Source Licenses (#4022 ) ### Commit Message - Integrated Google OSS Licenses Plugin to display the licenses of third-party libraries used in the app. - Added the plugin to app-level Gradle file and included the required dependencies. - Created a pre-built activity (`OssLicensesMenuActivity`) to show the licenses, accessible via a button/menu. - Verified the implementation, ensuring the licenses are displayed correctly. - Tested on release builds to confirm functionality and compliance. This implementation ensures transparency and complies with open-source license requirements.	2024-11-23 20:04:37 +08:00
2dust	c78e624eaf	Add VPN setHttpProxy https://github.com/2dust/v2rayNG/issues/4017	2024-11-23 10:25:21 +08:00
2dust	934cf5d21c	Bug fix https://github.com/2dust/v2rayNG/issues/4020	2024-11-23 09:52:02 +08:00
2dust	f252d1395a	up 1.9.19	2024-11-21 20:30:35 +08:00
2dust	2dc0472c69	When creating a new routing rule, add it to the top	2024-11-21 20:24:01 +08:00
hosêyň abāspanā	3e09adc4d1	Improved Luri Bakhtiari Translation (#4003 )	2024-11-21 09:26:08 +08:00
phoenix6936	11750b9382	Improved Persian translation (#4001 ) * Improved Persian translation Improved Persian translation * Improved Persian translation Improved Persian translation	2024-11-21 09:25:48 +08:00
solokot	30a4c2199a	Improved Russian translation (#3997 )	2024-11-20 16:00:14 +08:00