Chore: bump version

Chore: update PRIVACY_POLICY.md
Fix: decrease mtu
2022-11-17 00:44:11 +08:00 · 2022-11-17 00:43:06 +08:00 · 2022-11-17 00:31:23 +08:00 · 2022-07-04 10:30:43 +08:00 · 2022-07-02 11:07:30 +08:00 · 2022-07-02 11:02:07 +08:00
10 changed files with 89 additions and 53 deletions
--- a/PRIVACY_POLICY.md
+++ b/PRIVACY_POLICY.md
@@ -4,24 +4,19 @@ The Clash for Android is built as an Open Source software. This app is provided

 This page is used to inform visitors regarding our policies with the collection, use, and disclosure of Personal Information if anyone decided to use our app.

-If you choose to use our app, then you agree to the collection and use of information in relation to this policy. The Personal Information that we collect is used for providing and improving the app. We will not use or share your information with anyone except as described in this Privacy Policy.
-
-The terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which is accessible at Clash for Android unless otherwise defined in this Privacy Policy.
-
 **Information Collection and Use**

-For a better experience, while using our app, we may require you to provide us with certain personally identifiable information. The information that we request will be retained by us and used as described in this privacy policy.
+We will not upload any of your personally information and that will be stored in the internal storage or memory.

-The app does use third party services that may collect information used to identify you.
+We collect the following information and store it in memory, and such information will be destroyed when the application is fully exited.

-Link to privacy policy of third party service providers used by the app
+- Installed Applications

-*   [Google Play Services](https://www.google.com/policies/privacy/)
-*   [AppCenter](https://docs.microsoft.com/en-us/appcenter/gdpr/)
+  This data is used for the PROCESS-NAME rule.

 **Log Data**

-We want to inform you that whenever you use our app, in a case of an error in the app we collect data and information (through third party products) on your phone called Log Data. This Log Data may include information such as your device Internet Protocol (“IP”) address, device name, operating system version, the configuration of the app when utilizing our App, the time and date of your use of the app, and other statistics.
+We do not collect log data unless you use log collector.

 **Cookies**

@@ -37,10 +32,6 @@ We value your trust in providing us your Personal Information, thus we are striv

 This app may contain links to other sites. If you click on a third-party link, you will be directed to that site. Note that these external sites are not operated by us. Therefore, we strongly advise you to review the Privacy Policy of these websites. We have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party sites or services.

-**Children’s Privacy**
-
-These Services do not address anyone under the age of 13\. We do not knowingly collect personally identifiable information from children under 13\. In the case we discover that a child under 13 has provided us with personal information, we immediately delete this from our servers. If you are a parent or guardian and you are aware that your child has provided us with personal information, please contact us so that we will be able to do necessary actions.
-
 **Changes to This Privacy Policy**

 We may update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page. These changes are effective immediately after they are posted on this page.
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -40,8 +40,8 @@ subprojects {
            minSdk = 21
            targetSdk = 31

-            versionName = "2.5.9"
-            versionCode = 205009
+            versionName = "2.5.12"
+            versionCode = 205012

            resValue("string", "release_name", "v$versionName")
            resValue("integer", "release_code", "$versionCode")
--- a/core/src/main/golang/native/config/process.go
+++ b/core/src/main/golang/native/config/process.go
@@ -22,6 +22,7 @@ var processors = []processor{
 	patchProfile,
 	patchDns,
 	patchProviders,
+	patchTun,
 	validConfig,
 }

--- a/core/src/main/golang/native/config/process_open.go
+++ b/core/src/main/golang/native/config/process_open.go
@@ -0,0 +1,9 @@
+//go:build !premium
+
+package config
+
+import "github.com/Dreamacro/clash/config"
+
+func patchTun(cfg *config.RawConfig, _ string) error {
+	return nil
+}
--- a/core/src/main/golang/native/config/process_premium.go
+++ b/core/src/main/golang/native/config/process_premium.go
@@ -0,0 +1,11 @@
+//go:build premium
+
+package config
+
+import "github.com/Dreamacro/clash/config"
+
+func patchTun(cfg *config.RawConfig, _ string) error {
+	cfg.Tun.Enable = false
+
+	return nil
+}
--- a/core/src/main/java/com/github/kr328/clash/core/model/ConfigurationOverride.kt
+++ b/core/src/main/java/com/github/kr328/clash/core/model/ConfigurationOverride.kt
@@ -49,6 +49,9 @@ data class ConfigurationOverride(

    @SerialName("clash-for-android")
    val app: App = App(),
+
+    @SerialName("experimental")
+    val experimental: Experimental = Experimental()
 ) : Parcelable {
    @Serializable
    data class Dns(
@@ -107,6 +110,12 @@ data class ConfigurationOverride(
        var appendSystemDns: Boolean? = null
    )

+    @Serializable
+    data class Experimental(
+        @SerialName("sniff-tls-sni")
+        var sniffTLSSNI: Boolean? = null,
+    )
+
    @Serializable
    enum class DnsEnhancedMode {
        @SerialName("normal")
--- a/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt
+++ b/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt
@@ -223,6 +223,15 @@ class OverrideSettingsDesign(
                )
            }

+            if (BuildConfig.PREMIUM) {
+                selectableList(
+                    value = configuration.experimental::sniffTLSSNI,
+                    values = booleanValues,
+                    valuesText = booleanValuesText,
+                    title = R.string.sniff_tls_sni,
+                )
+            }
+
            selectableList(
                value = configuration::logLevel,
                values = arrayOf(
--- a/design/src/main/res/values-zh-rTW/strings.xml
+++ b/design/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="access_control_packages_summary">配置應用程式存取權</string>
+    <string name="access_control_packages_summary">設定應用程式存取權</string>
    <string name="about">關於</string>
    <string name="access_control_mode">存取控制套件</string>
    <string name="access_control_packages">存取控制應用程式套件清單</string>
@@ -18,8 +18,8 @@
    <string name="default_">預設</string>
    <string name="delay">延遲</string>
    <string name="delete">刪除</string>
-    <string name="delete_all_logs">刪除所有日誌檔</string>
-    <string name="delete_all_logs_warn">所有歷史日誌將被刪除</string>
+    <string name="delete_all_logs">刪除所有紀錄檔</string>
+    <string name="delete_all_logs_warn">所有歷史紀錄將被刪除</string>
    <string name="detail">詳細資料</string>
    <string name="direct_mode">直連模式</string>
    <string name="disabled">已停用</string>
@@ -29,7 +29,7 @@
    <string name="edit">編輯</string>
    <string name="empty_name">空白名稱</string>
    <string name="exit_without_save">退出而不儲存</string>
-    <string name="exit_without_save_warning">所有變更將會丟失</string>
+    <string name="exit_without_save_warning">將遺失所有變更</string>
    <string name="export">匯出</string>
    <string name="external">外部</string>
    <string name="file">檔案</string>
@@ -45,7 +45,7 @@
    <string name="invalid_url">無效 URL</string>
    <string name="launch_name">Clash</string>
    <string name="logcat">Logcat</string>
-    <string name="logs">日誌</string>
+    <string name="logs">紀錄</string>
    <string name="mode">模式</string>
    <string name="name">名稱</string>
    <string name="network">網路</string>
@@ -68,27 +68,27 @@
    <string name="allow_clash_auto_restart">允許 Clash 自動重新啟動</string>
    <string name="auto_restart">自動重新啟動</string>
    <string name="stopped">已停止</string>
-    <string name="help">協助</string>
+    <string name="help">幫助</string>
    <string name="tap_to_start">輕觸以啟動</string>
    <string name="update">更新</string>
    <string name="url">URL</string>
    <string name="vpn_service_options">VpnService 選項</string>
    <string name="options_unavailable">選項在 Clash 執行時不可用</string>
    <string name="search">搜尋</string>
-    <string name="system_apps">系統應用</string>
+    <string name="system_apps">系統程式</string>
    <string name="update_time">更新時間</string>
    <string name="package_name">套件名稱</string>
    <string name="install_time">安裝時間</string>
    <string name="clash_for_android">Clash for Android</string>
    <string name="feedback">回饋</string>
-    <string name="github_issues">Github Issues</string>
+    <string name="github_issues">GitHub Issues</string>
    <string name="tips_properties"><![CDATA[僅接受 <strong>Clash 設定檔</strong> (包含<strong>Proxy</strong> /<strong>規則</strong>)]]></string>
    <string name="loading">載入中</string>
    <string name="tips_help"><![CDATA[Clash for Android 是一個<strong>免費應用程式</strong>並且我們<strong>不</strong>為其提供任何服務, <strong>請務必不要回報非應用程式自身引起的問題</strong>]]></string>
-    <string name="donate">捐助</string>
-    <string name="allow_all_apps">允許所有應用</string>
-    <string name="allow_selected_apps">僅允許已選擇的應用</string>
-    <string name="deny_selected_apps">不允許已選擇的應用</string>
+    <string name="donate">抖內</string>
+    <string name="allow_all_apps">允許所有應用程式</string>
+    <string name="allow_selected_apps">僅允許已選擇的應用程式</string>
+    <string name="deny_selected_apps">不允許已選擇的應用程式</string>
    <string name="no_profile_selected">未選擇設定檔</string>
    <string name="copied">已複製</string>
    <string name="script_mode">腳本模式</string>
@@ -97,8 +97,8 @@
    <string name="select_all">全選</string>
    <string name="select_invert">反選</string>
    <string name="select_none">清除</string>
-    <string name="app">應用</string>
-    <string name="follow_system_android_10">系統預設 (Android 10+)</string>
+    <string name="app">應用程式</string>
+    <string name="follow_system_android_10">跟隨系統設定 (Android 10+)</string>
    <string name="always_dark">深色</string>
    <string name="always_light">淺色</string>
    <string name="service">服務</string>
@@ -112,7 +112,7 @@
    <string name="mixed_port">Mixed 埠</string>
    <string name="allow_lan">允許來自區域網路的連線</string>
    <string name="bind_address">監聽位址</string>
-    <string name="log_level">日誌層次</string>
+    <string name="log_level">紀錄等級</string>
    <string name="ipv6">IPv6</string>
    <string name="hosts">Hosts</string>
    <string name="enabled">已啟用</string>
@@ -125,21 +125,21 @@
    <string name="strategy">策略</string>
    <string name="enhanced_mode">增強模式</string>
    <string name="name_server">名稱伺服器</string>
-    <string name="fallback">後饋名稱伺服器</string>
+    <string name="fallback">備用名稱伺服器</string>
    <string name="default_name_server">預設名稱伺服器</string>
    <string name="fakeip_filter">FakeIP 過濾器</string>
-    <string name="geoip_fallback">GeoIP 後饋</string>
-    <string name="ipcidr_fallback">IPCIDR 後饋</string>
+    <string name="geoip_fallback">GeoIP 備用</string>
+    <string name="ipcidr_fallback">IPCIDR 備用</string>
    <string name="use_built_in">使用內建</string>
    <string name="mapping">Real-IP 至域名映射</string>
    <string name="fakeip">Fake-IP 至域名映射</string>
    <string name="sort">排序</string>
-    <string name="layout">佈局</string>
+    <string name="layout">版面配置</string>
    <string name="single">單欄</string>
    <string name="multiple">多欄</string>
-    <string name="not_selectable">不可選擇</string>
+    <string name="not_selectable">無法選擇</string>
    <string name="providers">提供者</string>
-    <string name="unavailable">不可用</string>
+    <string name="unavailable">無法使用</string>
    <string name="_new">新增</string>
    <string name="value">值</string>
    <string name="listen">監聽</string>
@@ -162,25 +162,25 @@
    <string name="reset">重設</string>
    <string name="use_hosts">使用 Hosts</string>
    <string name="authentication">認證</string>
-    <string name="domain_fallback">域名 Fallback</string>
-    <string name="empty">置空</string>
+    <string name="domain_fallback">備用域名</string>
+    <string name="empty">空</string>
    <string name="import_from_clipboard">從剪貼簿匯入</string>
    <string name="export_to_clipboard">匯出至剪貼簿</string>
    <string name="auto_update_minutes">自動更新 (分鐘)</string>
    <string name="profile_url">設定檔 URL</string>
    <string name="should_not_be_blank">不能為空</string>
    <string name="format_fetching_configuration">正在從 %s 下載設定檔</string>
-    <string name="format_fetching_provider">正在下載外部資源 %s</string>
+    <string name="format_fetching_provider">正在下載額外資源 %s</string>
    <string name="initializing">正在初始化</string>
    <string name="verifying">正在校驗</string>
-    <string name="sideload_geoip">旁載入 GEOIP</string>
-    <string name="sideload_geoip_summary">外部 GEOIP 資料庫</string>
+    <string name="sideload_geoip">側載 GeoIP</string>
+    <string name="sideload_geoip_summary">外部 GeoIP 資料庫</string>
    <string name="force_enable">強制啟用</string>
    <string name="document">文件</string>
    <string name="clash_wiki">Clash Wiki</string>
    <string name="invalid_file_name">無效的檔案名稱</string>
-    <string name="reset_override_settings">重置覆寫設定</string>
-    <string name="reset_override_settings_message">所有的覆寫設定將會被抹除</string>
+    <string name="reset_override_settings">重設覆寫設定</string>
+    <string name="reset_override_settings_message">所有的覆寫設定將會被移除</string>
    <string name="key">鍵</string>
    <string name="more">更多</string>
    <string name="save">儲存</string>
@@ -195,22 +195,26 @@
    <string name="reverse">反轉</string>
    <string name="close">關閉</string>
    <string name="keyword">關鍵字</string>
-    <string name="invalid_log_file">無效的日誌檔</string>
+    <string name="invalid_log_file">無效的紀錄檔</string>
    <string name="application_crashed">應用程式崩潰</string>
-    <string name="application_broken_tips">應用程式缺少必要的執行元件，這通常是由於下載了不完整的 Apk 而導致。</string>
+    <string name="application_broken_tips">應用程式缺少必要的執行元件，這通常是由於下載了不完整的 APK 而導致。</string>
    <string name="reinstall">重新安裝</string>
-    <string name="github_releases">Github Releases</string>
+    <string name="github_releases">GitHub Releases</string>
    <string name="unable_to_start_vpn">無法啟動 VPN 元件</string>
-    <string name="request_donate_tips">如果您覺得本應用對您有幫助歡迎在 [協助] 中給予開發人員一些捐助</string>
-    <string name="request_donate">捐助</string>
-    <string name="version_updated">應用已更新</string>
+    <string name="request_donate_tips">如果您覺得本應用程式對您有幫助，歡迎在 [幫助] 中給予開發人員一些抖內</string>
+    <string name="request_donate">抖內</string>
+    <string name="version_updated">應用程式已更新</string>
    <string name="version_updated_tips">設定已被清除，舊版設定檔需要再次儲存。</string>
-    <string name="active_unsaved_tips">設定檔需要在啟用之前儲存</string>
+    <string name="active_unsaved_tips">設定檔需要在開啟之前儲存</string>
    <string name="mode_switch_tips">僅在本次工作階段中有效</string>
    <string name="import_">匯入</string>
    <string name="sources">原始碼</string>
    <string name="clash_core">Clash 核心</string>
    <string name="name_server_policy">Name Server 政策</string>
-    <string name="block_loopback">攔截本地回送</string>
-    <string name="block_loopback_summary">攔截本地回送連結</string>
+    <string name="block_loopback">阻擋本地迴送</string>
+    <string name="block_loopback_summary">阻擋本地回連結</string>
+	<string name="geoip_fallback_code">GeoIP 備用區域代碼</string>
+    <string name="allow_bypass">允許應用程式繞過</string>
+    <string name="allow_bypass_summary">允許其他程式繞過 VPN</string>
+    <string name="sniff_tls_sni">嗅探 TLS 的 SNI</string>
 </resources>
--- a/design/src/main/res/values-zh/strings.xml
+++ b/design/src/main/res/values-zh/strings.xml
@@ -216,4 +216,5 @@
    <string name="geoip_fallback_code">GeoIP Fallback 区域代码</string>
    <string name="allow_bypass">允许应用绕过</string>
    <string name="allow_bypass_summary">允许其他应用绕过 VPN</string>
+    <string name="sniff_tls_sni">嗅探 TLS 的 SNI</string>
 </resources>
--- a/design/src/main/res/values/strings.xml
+++ b/design/src/main/res/values/strings.xml
@@ -145,6 +145,7 @@
    <string name="bind_address">Bind Address</string>
    <string name="mode">Mode</string>
    <string name="log_level">Log Level</string>
+    <string name="sniff_tls_sni">Sniff TLS SNI</string>
    <string name="ipv6">IPv6</string>
    <string name="hosts">Hosts</string>
    <string name="sideload_geoip">Sideload GEOIP</string>
Author	SHA1	Message	Date
Kr328	8506303693	Chore: bump version Some checks failed Build Unsigned / BuildUnsigned (push) Has been cancelled Details	2022-11-17 00:44:11 +08:00
Kr328	8758c561d2	Chore: update PRIVACY_POLICY.md	2022-11-17 00:43:06 +08:00
Kr328	04efed17af	Fix: decrease mtu	2022-11-17 00:31:23 +08:00
EdwardWu	769b80b079	Chore: Translation: Update zh-rTW strings (#1537 ) * Chore: Translation: Update zh-rTW strings[1/2] The words usage of the translation strings in the past are in the style of China rather than Taiwan. I'm Taiwanese, who works on Android and Translation projects. Signed-off-by: Edward Wu <bluehome.wu@gmail.com> * Chore: Translation: Update zh-rTW strings[2/2] * With latest strings and merge @pan93412 suggest. Signed-off-by: Edward Wu <bluehome.wu@gmail.com>	2022-07-04 10:30:43 +08:00
Kr328	628eb2809e	Chore: bump version	2022-07-02 11:07:30 +08:00
Kr328	9f76a377ab	Improve: increase tun mtu	2022-07-02 11:02:07 +08:00
Kr328	26d3decd06	Chore: remove temp debug code	2022-07-02 11:01:00 +08:00
Kr328	7b7ee554e3	Feature: add option to enable sni sniff	2022-07-02 10:59:56 +08:00
Kr328	eb7cd8923f	Chore: bump version	2022-07-01 13:51:13 +08:00
Kr328	c2c09f52cc	Feature: enable sniff & disable tun for premium	2022-07-01 13:50:32 +08:00