Merge remote-tracking branch 'upstream/main' into main

Author: starifly

app/src/main/AndroidManifest.xml

@@ -227,6 +227,24 @@
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="io.nekohasekai.sagernet.ui.QuickEnableShortcut"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:label="@string/quick_enable"
+            android:launchMode="singleTask"
+            android:process=":bg"
+            android:taskAffinity=""
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <activity
+            android:name="io.nekohasekai.sagernet.ui.QuickDisableShortcut"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:label="@string/quick_disable"
+            android:launchMode="singleTask"
+            android:process=":bg"
+            android:taskAffinity=""
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
             android:name="io.nekohasekai.sagernet.ui.AppManagerActivity"
             android:configChanges="uiMode"

app/src/main/java/io/nekohasekai/sagernet/fmt/AbstractBean.java

@@ -144,8 +144,4 @@ public int hashCode() {
     public String toString() {
         return getClass().getSimpleName() + " " + JavaUtil.gson.toJson(this);
     }
-
-    public void applyFeatureSettings(AbstractBean other) {
-    }
-
 }

app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaBean.java

@@ -150,17 +150,6 @@ public void deserialize(ByteBufferInput input) {
         }
     }
 
-    @Override
-    public void applyFeatureSettings(AbstractBean other) {
-        if (!(other instanceof HysteriaBean)) return;
-        HysteriaBean bean = ((HysteriaBean) other);
-        bean.uploadMbps = uploadMbps;
-        bean.downloadMbps = downloadMbps;
-        bean.allowInsecure = allowInsecure;
-        bean.disableMtuDiscovery = disableMtuDiscovery;
-        bean.hopInterval = hopInterval;
-    }
-
     @Override
     public String displayAddress() {
         return NetsKt.wrapIPV6Host(serverAddress) + ":" + serverPorts;

app/src/main/java/io/nekohasekai/sagernet/fmt/shadowsocks/ShadowsocksBean.java

@@ -104,23 +104,6 @@ public void deserialize(ByteBufferInput input) {
         }
     }
 
-    @Override
-    public void applyFeatureSettings(AbstractBean other) {
-        if (!(other instanceof ShadowsocksBean)) return;
-        ShadowsocksBean bean = ((ShadowsocksBean) other);
-        bean.sUoT = sUoT;
-        bean.enableMux = enableMux;
-        bean.muxPadding = muxPadding;
-        bean.muxType = muxType;
-        bean.muxConcurrency = muxConcurrency;
-        bean.muxMode = muxMode;
-        bean.muxMaxConnections = muxMaxConnections;
-        bean.muxMinStreams = muxMinStreams;
-        bean.muxBrutal = muxBrutal;
-        bean.muxBrutalUpMbps = muxBrutalUpMbps;
-        bean.muxBrutalDownMbps = muxBrutalDownMbps;
-    }
-
     @NotNull
     @Override
     public ShadowsocksBean clone() {

app/src/main/java/io/nekohasekai/sagernet/fmt/trojan_go/TrojanGoBean.java

@@ -146,15 +146,6 @@ public void deserialize(ByteBufferInput input) {
         }
     }
 
-    @Override
-    public void applyFeatureSettings(AbstractBean other) {
-        if (!(other instanceof TrojanGoBean)) return;
-        TrojanGoBean bean = ((TrojanGoBean) other);
-        if (allowInsecure) {
-            bean.allowInsecure = true;
-        }
-    }
-
     @NotNull
     @Override
     public TrojanGoBean clone() {

app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt

@@ -17,11 +17,21 @@ fun parseTuic(url: String): TuicBean {
         protocolVersion = 5
 
         name = link.fragment
-        uuid = link.username
-        token = link.password
         serverAddress = link.host
         serverPort = link.port
 
+        val rawUser = link.username
+        val rawPass = link.password
+
+        if (rawUser.contains(":")) {
+            val parts = rawUser.split(":", limit = 2)
+            uuid = parts[0]
+            token = parts.getOrElse(1) { "" }
+        } else {
+            uuid = rawUser
+            token = rawPass
+        }
+
         link.queryParameter("sni")?.let {
             sni = it
         }

app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/StandardV2RayBean.java

@@ -355,27 +355,6 @@ public void deserialize(ByteBufferInput input) {
         // Note: kcp fields are read in the switch case above when version >= 6
     }
 
-    @Override
-    public void applyFeatureSettings(AbstractBean other) {
-        if (!(other instanceof StandardV2RayBean)) return;
-        StandardV2RayBean bean = ((StandardV2RayBean) other);
-        bean.allowInsecure = allowInsecure;
-        bean.utlsFingerprint = utlsFingerprint;
-        bean.packetEncoding = packetEncoding;
-        bean.enableECH = enableECH;
-        bean.echConfig = echConfig;
-        bean.enableMux = enableMux;
-        bean.muxPadding = muxPadding;
-        bean.muxType = muxType;
-        bean.muxConcurrency = muxConcurrency;
-        bean.muxMode = muxMode;
-        bean.muxMaxConnections = muxMaxConnections;
-        bean.muxMinStreams = muxMinStreams;
-        bean.muxBrutal = muxBrutal;
-        bean.muxBrutalUpMbps = muxBrutalUpMbps;
-        bean.muxBrutalDownMbps = muxBrutalDownMbps;
-    }
-
     public boolean isVLESS() {
         if (this instanceof VMessBean) {
             Integer aid = ((VMessBean) this).alterId;

app/src/main/java/io/nekohasekai/sagernet/group/RawUpdater.kt

@@ -176,7 +176,9 @@ object RawUpdater : GroupUpdater() {
             if (toReplace.contains(name)) {
                 val entity = toReplace[name]!!
                 val existsBean = entity.requireBean()
-                existsBean.applyFeatureSettings(bean)
+                // 更新订阅，保留自定义覆写设置
+                bean.customOutboundJson = existsBean.customOutboundJson
+                bean.customConfigJson = existsBean.customConfigJson
                 when {
                     existsBean != bean -> {
                         changed++
@@ -509,6 +511,15 @@ object RawUpdater : GroupUpdater() {
                                             }
                                         }
                                     }
+
+                                    "ech-opts" -> (opt.value as? Map<String, Any?>)?.also {
+                                        for (echOpt in it) {
+                                            when (echOpt.key) {
+                                                "enable" -> bean.enableECH =
+                                                    echOpt.value.toString() == "true"
+                                            }
+                                        }
+                                    }
                                 }
                             }
                             proxies.add(bean)

app/src/main/java/io/nekohasekai/sagernet/ui/AssetsActivity.kt

@@ -211,7 +211,12 @@ class AssetsActivity : ThemedActivity() {
 
             val localVersion = if (file.isFile) {
                 if (versionFile.isFile) {
-                    versionFile.readText().trim()
+                    try {
+                        versionFile.readText().trim()
+                    } catch (e: Throwable) {
+                        snackbar(e.readableMessage)
+                        "<unknown>"
+                    }
                 } else {
                     "Unknown-" + DateFormat.getDateFormat(app).format(Date(file.lastModified()))
                 }

app/src/main/java/io/nekohasekai/sagernet/ui/GroupFragment.kt

@@ -476,12 +476,17 @@ class GroupFragment : ToolbarFragment(R.layout.layout_group),
                         used += toLong()
                     }
                     val total = get("total=([0-9]+)")?.toLong() ?: 0
+                    val remain = total - used
                     if (used > 0 || total > 0) {
-                        text += getString(
-                            R.string.subscription_traffic,
-                            used.toBytesString(),
-                            (total - used).toBytesString()
-                        )
+                        text += if (remain > 0) {
+                            getString(
+                                R.string.subscription_traffic,
+                                used.toBytesString(),
+                                remain.toBytesString()
+                            )
+                        } else {
+                            getString(R.string.subscription_used, used.toBytesString())
+                        }
                     }
                     get("expire=([0-9]+)")?.apply {
                         text += "\n"