From 68c4be26afb0ec29d1b1e51356e8af6a875a4330 Mon Sep 17 00:00:00 2001
From: wwqgtxx <wwqgtxx@gmail.com>
Date: Thu, 11 Jun 2026 08:57:05 +0800
Subject: [PATCH 1/3] don't use enum class for Proxy.Type

---
 .../com/github/kr328/clash/ProxyActivity.kt   |  2 +-
 .../main/golang/.idea/codeStyles/Project.xml  |  1 -
 core/src/main/golang/native/tunnel/proxies.go |  5 +++
 .../java/com/github/kr328/clash/core/Clash.kt |  2 +-
 .../github/kr328/clash/core/model/Proxy.kt    | 45 +------------------
 .../kr328/clash/core/model/ProxyGroup.kt      |  6 +--
 .../clash/design/adapter/ProxyPageAdapter.kt  |  2 +-
 .../clash/design/component/ProxyViewState.kt  |  6 +--
 8 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt b/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
index 7fa361a730..9136a3000d 100644
--- a/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
@@ -75,7 +75,7 @@ class ProxyActivity : BaseActivity<ProxyDesign>() {
                                 design.updateGroup(
                                     it.index,
                                     group.proxies,
-                                    group.type == Proxy.Type.Selector,
+                                    group.type == "Selector",
                                     state,
                                     unorderedStates
                                 )
diff --git a/core/src/main/golang/.idea/codeStyles/Project.xml b/core/src/main/golang/.idea/codeStyles/Project.xml
index 235439ed29..52dc297cac 100644
--- a/core/src/main/golang/.idea/codeStyles/Project.xml
+++ b/core/src/main/golang/.idea/codeStyles/Project.xml
@@ -1,7 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <GoCodeStyleSettings>
-      <option name="IMPORT_SORTING" value="GOIMPORTS" />
       <option name="MOVE_ALL_IMPORTS_IN_ONE_DECLARATION" value="true" />
       <option name="MOVE_ALL_STDLIB_IMPORTS_IN_ONE_GROUP" value="true" />
       <option name="GROUP_STDLIB_IMPORTS" value="true" />
diff --git a/core/src/main/golang/native/tunnel/proxies.go b/core/src/main/golang/native/tunnel/proxies.go
index 3357d5046e..e750b7adde 100644
--- a/core/src/main/golang/native/tunnel/proxies.go
+++ b/core/src/main/golang/native/tunnel/proxies.go
@@ -27,6 +27,7 @@ type Proxy struct {
 	Subtitle string `json:"subtitle"`
 	Type     string `json:"type"`
 	Delay    int    `json:"delay"`
+	IsGroup  bool   `json:"isGroup"`
 }
 
 type ProxyGroup struct {
@@ -189,6 +190,7 @@ func convertProxies(proxies []C.Proxy, uiSubtitlePattern *regexp2.Regexp) []*Pro
 				break
 			}
 		}
+		_, isGroup := p.Adapter().(outboundgroup.ProxyGroup)
 
 		result = append(result, &Proxy{
 			Name:     name,
@@ -196,6 +198,7 @@ func convertProxies(proxies []C.Proxy, uiSubtitlePattern *regexp2.Regexp) []*Pro
 			Subtitle: strings.TrimSpace(subtitle),
 			Type:     p.Type().String(),
 			Delay:    int(p.LastDelayForTestUrl(testURL)),
+			IsGroup:  isGroup,
 		})
 	}
 	return result
@@ -228,6 +231,7 @@ func collectProviders(providers []provider.ProxyProvider, uiSubtitlePattern *reg
 					break
 				}
 			}
+			_, isGroup := px.Adapter().(outboundgroup.ProxyGroup)
 
 			result = append(result, &Proxy{
 				Name:     name,
@@ -235,6 +239,7 @@ func collectProviders(providers []provider.ProxyProvider, uiSubtitlePattern *reg
 				Subtitle: strings.TrimSpace(subtitle),
 				Type:     px.Type().String(),
 				Delay:    int(px.LastDelayForTestUrl(testURL)),
+				IsGroup:  isGroup,
 			})
 		}
 	}
diff --git a/core/src/main/java/com/github/kr328/clash/core/Clash.kt b/core/src/main/java/com/github/kr328/clash/core/Clash.kt
index c3a2be684a..edba62bed0 100644
--- a/core/src/main/java/com/github/kr328/clash/core/Clash.kt
+++ b/core/src/main/java/com/github/kr328/clash/core/Clash.kt
@@ -116,7 +116,7 @@ object Clash {
     fun queryGroup(name: String, sort: ProxySort): ProxyGroup {
         return Bridge.nativeQueryGroup(name, sort.name)
             ?.let { Json.Default.decodeFromString(ProxyGroup.serializer(), it) }
-            ?: ProxyGroup(Proxy.Type.Unknown, emptyList(), "")
+            ?: ProxyGroup("Unknown", emptyList(), "")
     }
 
     fun healthCheck(name: String): CompletableDeferred<Unit> {
diff --git a/core/src/main/java/com/github/kr328/clash/core/model/Proxy.kt b/core/src/main/java/com/github/kr328/clash/core/model/Proxy.kt
index 4e0918adf9..02f910d776 100644
--- a/core/src/main/java/com/github/kr328/clash/core/model/Proxy.kt
+++ b/core/src/main/java/com/github/kr328/clash/core/model/Proxy.kt
@@ -10,51 +10,10 @@ data class Proxy(
     val name: String,
     val title: String,
     val subtitle: String,
-    val type: Type,
+    val type: String,
     val delay: Int,
+    var isGroup: Boolean,
 ) : Parcelable {
-    @Suppress("unused")
-    enum class Type(val group: Boolean) {
-        Direct(false),
-        Reject(false),
-        RejectDrop(false),
-        Compatible(false),
-        Pass(false),
-        PassRule(false),
-
-        Shadowsocks(false),
-        ShadowsocksR(false),
-        Snell(false),
-        Socks5(false),
-        Http(false),
-        Vmess(false),
-        Vless(false),
-        Trojan(false),
-        Hysteria(false),
-        Hysteria2(false),
-        Tuic(false),
-        WireGuard(false),
-        Dns(false),
-        Ssh(false),
-        Mieru(false),
-        AnyTLS(false),
-        Sudoku(false),
-        Masque(false),
-        TrustTunnel(false),
-        OpenVPN(false),
-        Tailscale(false),
-        GostRelay(false),
-
-
-        Relay(true),
-        Selector(true),
-        Fallback(true),
-        URLTest(true),
-        LoadBalance(true),
-
-        Unknown(false);
-    }
-
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         Parcelizer.encodeToParcel(serializer(), parcel, this)
     }
diff --git a/core/src/main/java/com/github/kr328/clash/core/model/ProxyGroup.kt b/core/src/main/java/com/github/kr328/clash/core/model/ProxyGroup.kt
index 62ff4f8265..4090044845 100644
--- a/core/src/main/java/com/github/kr328/clash/core/model/ProxyGroup.kt
+++ b/core/src/main/java/com/github/kr328/clash/core/model/ProxyGroup.kt
@@ -8,7 +8,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ProxyGroup(
-    val type: Proxy.Type,
+    val type: String,
     val proxies: List<Proxy>,
     val now: String,
 ) : Parcelable {
@@ -35,13 +35,13 @@ data class ProxyGroup(
     }
 
     constructor(parcel: Parcel) : this(
-        Proxy.Type.values()[parcel.readInt()],
+        parcel.readString()!!,
         SliceProxyList(parcel),
         parcel.readString()!!,
     )
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
-        parcel.writeInt(type.ordinal)
+        parcel.writeString(type)
         SliceProxyList(proxies).writeToParcel(parcel, 0)
         parcel.writeString(now)
     }
diff --git a/design/src/main/java/com/github/kr328/clash/design/adapter/ProxyPageAdapter.kt b/design/src/main/java/com/github/kr328/clash/design/adapter/ProxyPageAdapter.kt
index 8fff6feb00..db4ccbc31b 100644
--- a/design/src/main/java/com/github/kr328/clash/design/adapter/ProxyPageAdapter.kt
+++ b/design/src/main/java/com/github/kr328/clash/design/adapter/ProxyPageAdapter.kt
@@ -34,7 +34,7 @@ class ProxyPageAdapter(
     ) {
         val states = withContext(Dispatchers.Default) {
             proxies.map {
-                val link = if (it.type.group) links[it.name] else null
+                val link = if (it.isGroup) links[it.name] else null
 
                 ProxyViewState(config, it, parent, link)
             }
diff --git a/design/src/main/java/com/github/kr328/clash/design/component/ProxyViewState.kt b/design/src/main/java/com/github/kr328/clash/design/component/ProxyViewState.kt
index 88e2bcae4d..cb52c64ac0 100644
--- a/design/src/main/java/com/github/kr328/clash/design/component/ProxyViewState.kt
+++ b/design/src/main/java/com/github/kr328/clash/design/component/ProxyViewState.kt
@@ -36,17 +36,17 @@ class ProxyViewState(
         val frameTime = System.currentTimeMillis()
         var invalidate = false
 
-        if (proxy.type.group) {
+        if (proxy.isGroup) {
             title = proxy.name
 
             if (link == null) {
-                subtitle = proxy.type.name
+                subtitle = proxy.type
             } else {
                 if (linkNow !== link.now) {
                     linkNow = link.now
 
                     subtitle = "%s(%s)".format(
-                        proxy.type.name,
+                        proxy.type,
                         link.now.ifEmpty { "*" }
                     )
                 }

From 2b909e24ddb05a71fd65741168886e35f5d3da7d Mon Sep 17 00:00:00 2001
From: wwqgtxx <wwqgtxx@gmail.com>
Date: Thu, 11 Jun 2026 09:26:31 +0800
Subject: [PATCH 2/3] Update FilterMode

---
 .../github/kr328/clash/core/model/ConfigurationOverride.kt  | 3 +++
 .../com/github/kr328/clash/design/OverrideSettingsDesign.kt | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git 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
index 7d3b222db6..a5367b6654 100644
--- 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
@@ -172,6 +172,9 @@ data class ConfigurationOverride(
 
         @SerialName("whitelist")
         WhiteList,
+
+        @SerialName("rule")
+        Rule,
     }
 
     @Serializable
diff --git a/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt b/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt
index e35944ca45..ea4d41215c 100644
--- a/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt
+++ b/design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt
@@ -352,12 +352,14 @@ class OverrideSettingsDesign(
                 values = arrayOf(
                     null,
                     ConfigurationOverride.FilterMode.BlackList,
-                    ConfigurationOverride.FilterMode.WhiteList
+                    ConfigurationOverride.FilterMode.WhiteList,
+                    ConfigurationOverride.FilterMode.Rule
                 ),
                 valuesText = arrayOf(
                     R.string.dont_modify,
                     R.string.blacklist,
-                    R.string.whitelist
+                    R.string.whitelist,
+                    R.string.rule
                 ),
                 title = R.string.fakeip_filter_mode,
                 configure = dnsDependencies::add,

From 8a0e818272b92382b3d2ae61b29911653b9801cb Mon Sep 17 00:00:00 2001
From: xishang0128 <xishang02@gmail.com>
Date: Thu, 11 Jun 2026 10:52:28 +0800
Subject: [PATCH 3/3] Move subscription info fetch into Go

---
 core/src/main/golang/native/config/fetch.go   |  95 ++++++++++--
 .../kr328/clash/core/model/FetchStatus.kt     |  10 +-
 .../kr328/clash/design/PropertiesDesign.kt    |   3 +-
 service/build.gradle.kts                      |   7 +-
 .../kr328/clash/service/ProfileManager.kt     |  82 -----------
 .../kr328/clash/service/ProfileProcessor.kt   | 135 +++++++-----------
 6 files changed, 144 insertions(+), 188 deletions(-)

diff --git a/core/src/main/golang/native/config/fetch.go b/core/src/main/golang/native/config/fetch.go
index e677034113..c89cf4a847 100644
--- a/core/src/main/golang/native/config/fetch.go
+++ b/core/src/main/golang/native/config/fetch.go
@@ -10,45 +10,62 @@ import (
 	"os"
 	P "path"
 	"runtime"
+	"strconv"
+	"strings"
 	"time"
 
 	"cfa/native/app"
 
+	"github.com/metacubex/mihomo/adapter/provider"
 	clashHttp "github.com/metacubex/mihomo/component/http"
 	RB "github.com/metacubex/mihomo/rules/bundle"
 )
 
 type Status struct {
-	Action      string   `json:"action"`
-	Args        []string `json:"args"`
-	Progress    int      `json:"progress"`
-	MaxProgress int      `json:"max"`
+	Action            string   `json:"action"`
+	Args              []string `json:"args"`
+	Progress          int      `json:"progress"`
+	MaxProgress       int      `json:"max"`
+	SubUpload         *int64   `json:"subUpload,omitempty"`
+	SubDownload       *int64   `json:"subDownload,omitempty"`
+	SubTotal          *int64   `json:"subTotal,omitempty"`
+	SubExpire         *int64   `json:"subExpire,omitempty"`
+	SubUpdateInterval *int64   `json:"subUpdateInterval,omitempty"`
 }
 
-func openUrl(ctx context.Context, url string) (io.ReadCloser, error) {
+type fetchHeader struct {
+	SubscriptionUserInfo  string
+	ProfileUpdateInterval string
+}
+
+func openUrl(ctx context.Context, url string) (io.ReadCloser, fetchHeader, error) {
 	response, err := clashHttp.HttpRequest(ctx, url, http.MethodGet, http.Header{"User-Agent": {"ClashMetaForAndroid/" + app.VersionName()}}, nil)
 
 	if err != nil {
-		return nil, err
+		return nil, fetchHeader{}, err
 	}
 
-	return response.Body, nil
+	return response.Body, fetchHeader{
+		SubscriptionUserInfo:  response.Header.Get("subscription-userinfo"),
+		ProfileUpdateInterval: response.Header.Get("profile-update-interval"),
+	}, nil
 }
 
 func openContent(url string) (io.ReadCloser, error) {
 	return app.OpenContent(url)
 }
 
-func fetch(url *U.URL, file string) error {
+func fetch(url *U.URL, file string) (fetchHeader, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancel()
 
 	var reader io.ReadCloser
+	var header fetchHeader
 	var err error
 
 	switch url.Scheme {
 	case "http", "https":
-		reader, err = openUrl(ctx, url.String())
+		reader, header, err = openUrl(ctx, url.String())
 	case "content":
 		reader, err = openContent(url.String())
 	default:
@@ -56,12 +73,12 @@ func fetch(url *U.URL, file string) error {
 	}
 
 	if err != nil {
-		return err
+		return fetchHeader{}, err
 	}
 
 	defer reader.Close()
 
-	return writeFile(file, reader)
+	return header, writeFile(file, reader)
 }
 
 func writeFile(file string, reader io.Reader) error {
@@ -82,6 +99,55 @@ func writeFile(file string, reader io.Reader) error {
 	return err
 }
 
+func parseProfileUpdateInterval(value string) (int64, bool) {
+	hours, err := strconv.ParseInt(strings.TrimSpace(value), 10, 64)
+	if err != nil {
+		return 0, false
+	}
+
+	if hours <= 0 {
+		return 0, true
+	}
+
+	interval := time.Duration(hours) * time.Hour
+	if interval < 15*time.Minute {
+		interval = 15 * time.Minute
+	}
+
+	return int64(interval / time.Millisecond), true
+}
+
+func reportSubscriptionInfo(header fetchHeader, reportStatus func(string)) {
+	userinfo := header.SubscriptionUserInfo
+	updateIntervalHeader := header.ProfileUpdateInterval
+	if userinfo == "" && updateIntervalHeader == "" {
+		return
+	}
+
+	status := Status{
+		Action:      "SubscriptionInfo",
+		Args:        []string{},
+		Progress:    -1,
+		MaxProgress: -1,
+	}
+
+	if userinfo != "" {
+		info := provider.NewSubscriptionInfo(userinfo)
+		expire := info.Expire * 1000
+		status.SubUpload = &info.Upload
+		status.SubDownload = &info.Download
+		status.SubTotal = &info.Total
+		status.SubExpire = &expire
+	}
+
+	if interval, ok := parseProfileUpdateInterval(updateIntervalHeader); ok {
+		status.SubUpdateInterval = &interval
+	}
+
+	bytes, _ := json.Marshal(&status)
+	reportStatus(string(bytes))
+}
+
 func FetchAndValid(
 	path string,
 	url string,
@@ -105,9 +171,12 @@ func FetchAndValid(
 
 		reportStatus(string(bytes))
 
-		if err := fetch(url, configPath); err != nil {
+		header, err := fetch(url, configPath)
+		if err != nil {
 			return err
 		}
+
+		reportSubscriptionInfo(header, reportStatus)
 	}
 
 	defer runtime.GC()
@@ -166,7 +235,7 @@ func FetchAndValid(
 			}
 		}
 
-		_ = fetch(url, ps)
+		_, _ = fetch(url, ps)
 	})
 
 	bytes, _ := json.Marshal(&Status{
diff --git a/core/src/main/java/com/github/kr328/clash/core/model/FetchStatus.kt b/core/src/main/java/com/github/kr328/clash/core/model/FetchStatus.kt
index 2f23ab272c..6f7626e6e1 100644
--- a/core/src/main/java/com/github/kr328/clash/core/model/FetchStatus.kt
+++ b/core/src/main/java/com/github/kr328/clash/core/model/FetchStatus.kt
@@ -10,11 +10,17 @@ data class FetchStatus(
     val action: Action,
     val args: List<String>,
     val progress: Int,
-    val max: Int
+    val max: Int,
+    val subUpload: Long? = null,
+    val subDownload: Long? = null,
+    val subTotal: Long? = null,
+    val subExpire: Long? = null,
+    val subUpdateInterval: Long? = null,
 ) : Parcelable {
     enum class Action {
         FetchConfiguration,
         FetchProviders,
+        SubscriptionInfo,
         Verifying,
     }
 
@@ -35,4 +41,4 @@ data class FetchStatus(
             return arrayOfNulls(size)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/design/src/main/java/com/github/kr328/clash/design/PropertiesDesign.kt b/design/src/main/java/com/github/kr328/clash/design/PropertiesDesign.kt
index c3b5d56e82..b0c26eff65 100644
--- a/design/src/main/java/com/github/kr328/clash/design/PropertiesDesign.kt
+++ b/design/src/main/java/com/github/kr328/clash/design/PropertiesDesign.kt
@@ -178,6 +178,7 @@ class PropertiesDesign(context: Context) : Design<PropertiesDesign.Request>(cont
                 max = status.max
                 progress = status.progress
             }
+            FetchStatus.Action.SubscriptionInfo -> Unit
             FetchStatus.Action.Verifying -> {
                 text = context.getString(R.string.verifying)
                 isIndeterminate = false
@@ -186,4 +187,4 @@ class PropertiesDesign(context: Context) : Design<PropertiesDesign.Request>(cont
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
index 1c33c111a7..caf639ec76 100644
--- a/service/build.gradle.kts
+++ b/service/build.gradle.kts
@@ -19,11 +19,6 @@ dependencies {
     implementation(libs.androidx.room.ktx)
     implementation(libs.kaidl.runtime)
     implementation(libs.rikkax.multiprocess)
-    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
-
-    // define any required OkHttp artifacts without version
-    implementation("com.squareup.okhttp3:okhttp")
-    implementation("com.squareup.okhttp3:logging-interceptor")
 }
 
 afterEvaluate {
@@ -33,4 +28,4 @@ afterEvaluate {
             sourceSets[it.name].java.srcDir(buildDir.resolve("generated/ksp/${it.name}/java"))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/main/java/com/github/kr328/clash/service/ProfileManager.kt b/service/src/main/java/com/github/kr328/clash/service/ProfileManager.kt
index d2a49dc7de..e33b591dcc 100644
--- a/service/src/main/java/com/github/kr328/clash/service/ProfileManager.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/ProfileManager.kt
@@ -1,9 +1,7 @@
 package com.github.kr328.clash.service
 
 import android.content.Context
-import com.github.kr328.clash.common.log.Log
 import com.github.kr328.clash.service.data.Database
-import com.github.kr328.clash.service.data.Imported
 import com.github.kr328.clash.service.data.ImportedDao
 import com.github.kr328.clash.service.data.Pending
 import com.github.kr328.clash.service.data.PendingDao
@@ -20,10 +18,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import okhttp3.OkHttpClient
-import okhttp3.Request
 import java.io.FileNotFoundException
-import java.math.BigDecimal
 import java.util.*
 
 class ProfileManager(private val context: Context) : IProfileManager,
@@ -134,83 +129,6 @@ class ProfileManager(private val context: Context) : IProfileManager,
 
     override suspend fun update(uuid: UUID) {
         scheduleUpdate(uuid, true)
-        ImportedDao().queryByUUID(uuid)?.let {
-            if (it.type == Profile.Type.Url && it.source.startsWith("https://",true)) {
-                updateFlow(it)
-            }
-        }
-    }
-
-    suspend fun updateFlow(old: Imported) {
-        try {
-            val client = OkHttpClient()
-            val versionName = context.packageManager.getPackageInfo(context.packageName, 0).versionName
-            val request = Request.Builder()
-                .url(old.source)
-                .header("User-Agent", "ClashMetaForAndroid/$versionName")
-                .build()
-
-            client.newCall(request).execute().use { response ->
-                if (!response.isSuccessful || response.headers["subscription-userinfo"] == null) return
-
-                var upload: Long = 0
-                var download: Long = 0
-                var total: Long = 0
-                var expire: Long = 0
-
-                val userinfo = response.headers["subscription-userinfo"]
-                if (response.isSuccessful && userinfo != null) {
-
-                    val flags = userinfo.split(";")
-                    for (flag in flags) {
-                        val info = flag.split("=")
-                        when {
-                            info[0].contains("upload") && info[1].isNotEmpty() -> upload =
-                                BigDecimal(info[1].split('.').first()).longValueExact()
-
-                            info[0].contains("download") && info[1].isNotEmpty() -> download =
-                                BigDecimal(info[1].split('.').first()).longValueExact()
-
-                            info[0].contains("total") && info[1].isNotEmpty() ->  total =
-                                BigDecimal(info[1].split('.').first()).longValueExact()
-
-                            info[0].contains("expire") && info[1].isNotEmpty() -> {
-                                if (info[1].isNotEmpty()) {
-                                    expire = (info[1].toDouble()*1000).toLong()
-                                }
-                            }
-                        }
-                    }
-                }
-
-                val new = Imported(
-                    old.uuid,
-                    old.name,
-                    old.type,
-                    old.source,
-                    old.interval,
-                    upload,
-                    download,
-                    total,
-                    expire,
-                    old?.createdAt ?: System.currentTimeMillis(),
-                    ageSecretKey = old.ageSecretKey
-                )
-
-                if (old != null) {
-                    ImportedDao().update(new)
-                } else {
-                    ImportedDao().insert(new)
-                }
-
-                PendingDao().remove(new.uuid)
-                context.sendProfileChanged(new.uuid)
-                // println(response.body!!.string())
-            }
-
-        } catch (e: Exception) {
-            Log.w("Report fetch subscription-userinfo status: $e", e)
-        }
     }
 
     override suspend fun commit(uuid: UUID, callback: IFetchObserver?) {
diff --git a/service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt b/service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
index 1341731e8d..ff7d299945 100644
--- a/service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.Uri
 import com.github.kr328.clash.common.log.Log
 import com.github.kr328.clash.core.Clash
+import com.github.kr328.clash.core.model.FetchStatus
 import com.github.kr328.clash.service.data.Imported
 import com.github.kr328.clash.service.data.ImportedDao
 import com.github.kr328.clash.service.data.Pending
@@ -19,9 +20,6 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import java.math.BigDecimal
 import java.util.*
 import java.util.concurrent.TimeUnit
 
@@ -50,17 +48,7 @@ object ProfileProcessor {
                 Clash.setAgeSecretKey(snapshot.ageSecretKey?.takeIf { it.isNotBlank() })
 
                 val force = snapshot.type != Profile.Type.File
-                var cb = callback
-
-                Clash.fetchAndValid(context.processingDir, snapshot.source, force) {
-                    try {
-                        cb?.updateStatus(it)
-                    } catch (e: Exception) {
-                        cb = null
-
-                        Log.w("Report fetch status: $e", e)
-                    }
-                }.await()
+                val subscriptionInfo = fetchProfile(context, snapshot.source, force, callback)
 
                 profileLock.withLock {
                     if (PendingDao().queryByUUID(snapshot.uuid) == snapshot) {
@@ -68,70 +56,19 @@ object ProfileProcessor {
                         context.processingDir.copyRecursively(context.importedDir.resolve(snapshot.uuid.toString()))
 
                         val old = ImportedDao().queryByUUID(snapshot.uuid)
-                        var upload: Long = 0
-                        var download: Long = 0
-                        var total: Long = 0
-                        var expire: Long = 0
-                        var updateInterval: Long = snapshot.interval
-                        if (snapshot?.type == Profile.Type.Url) {
-                            if (snapshot.source.startsWith("https://", true)) {
-                                try {
-                                    val client = OkHttpClient()
-                                    val versionName =
-                                        context.packageManager.getPackageInfo(context.packageName, 0).versionName
-                                    val request = Request.Builder().url(snapshot.source)
-                                        .header("User-Agent", "ClashMetaForAndroid/$versionName").build()
-
-                                    client.newCall(request).execute().use { response ->
-                                        val userinfo = response.headers["subscription-userinfo"]
-                                        if (response.isSuccessful && userinfo != null) {
-                                            val flags = userinfo.split(";")
-                                            for (flag in flags) {
-                                                val info = flag.split("=")
-                                                when {
-                                                    info[0].contains("upload") && info[1].isNotEmpty() -> upload =
-                                                        BigDecimal(info[1].split('.').first()).longValueExact()
-
-                                                    info[0].contains("download") && info[1].isNotEmpty() -> download =
-                                                        BigDecimal(info[1].split('.').first()).longValueExact()
-
-                                                    info[0].contains("total") && info[1].isNotEmpty() -> total =
-                                                        BigDecimal(info[1].split('.').first()).longValueExact()
-
-                                                    info[0].contains("expire") && info[1].isNotEmpty() -> expire =
-                                                        (info[1].toDouble() * 1000).toLong()
-                                                }
-                                            }
-                                        }
-
-                                        val updateIntervalHeader = response.headers["profile-update-interval"]
-                                        if (old == null && snapshot.interval == 0L && response.isSuccessful && updateIntervalHeader != null) {
-                                            val intervalHours = updateIntervalHeader.toLongOrNull()
-                                            if (intervalHours != null) {
-                                                updateInterval = if (intervalHours > 0) {
-                                                    TimeUnit.HOURS.toMillis(intervalHours)
-                                                        .coerceAtLeast(TimeUnit.MINUTES.toMillis(15))
-                                                } else {
-                                                    0L
-                                                }
-                                            }
-                                        }
-                                    }
-                                } catch (e: Exception) {
-                                    Log.w("Report fetch subscription-userinfo status: $e", e)
-                                }
-                            }
-                        }
+                        val updateInterval = subscriptionInfo?.subUpdateInterval
+                            ?.takeIf { old == null && snapshot.interval == 0L }
+                            ?: snapshot.interval
                         val new = Imported(
                             snapshot.uuid,
                             snapshot.name,
                             snapshot.type,
                             snapshot.source,
                             updateInterval,
-                            upload,
-                            download,
-                            total,
-                            expire,
+                            subscriptionInfo?.subUpload ?: 0,
+                            subscriptionInfo?.subDownload ?: 0,
+                            subscriptionInfo?.subTotal ?: 0,
+                            subscriptionInfo?.subExpire ?: 0,
                             old?.createdAt ?: System.currentTimeMillis(),
                             ageSecretKey = snapshot.ageSecretKey
                         )
@@ -170,23 +107,26 @@ object ProfileProcessor {
 
                 Clash.setAgeSecretKey(snapshot.ageSecretKey?.takeIf { it.isNotBlank() })
 
-                var cb = callback
-
-                Clash.fetchAndValid(context.processingDir, snapshot.source, true) {
-                    try {
-                        cb?.updateStatus(it)
-                    } catch (e: Exception) {
-                        cb = null
-
-                        Log.w("Report fetch status: $e", e)
-                    }
-                }.await()
+                val subscriptionInfo = fetchProfile(context, snapshot.source, true, callback)
 
                 profileLock.withLock {
-                    if (ImportedDao().exists(snapshot.uuid)) {
+                    val imported = ImportedDao().queryByUUID(snapshot.uuid)
+                    if (imported != null) {
                         context.importedDir.resolve(snapshot.uuid.toString()).deleteRecursively()
                         context.processingDir.copyRecursively(context.importedDir.resolve(snapshot.uuid.toString()))
 
+                        val upload = subscriptionInfo?.subUpload
+                        if (upload != null) {
+                            ImportedDao().update(
+                                imported.copy(
+                                    upload = upload,
+                                    download = subscriptionInfo.subDownload ?: 0,
+                                    total = subscriptionInfo.subTotal ?: 0,
+                                    expire = subscriptionInfo.subExpire ?: 0,
+                                )
+                            )
+                        }
+
                         context.sendProfileChanged(snapshot.uuid)
                     }
                 }
@@ -194,6 +134,33 @@ object ProfileProcessor {
         }
     }
 
+    private suspend fun fetchProfile(
+        context: Context,
+        source: String,
+        force: Boolean,
+        callback: IFetchObserver?,
+    ): FetchStatus? {
+        var subscriptionInfo: FetchStatus? = null
+        var cb = callback
+
+        Clash.fetchAndValid(context.processingDir, source, force) {
+            if (it.action == FetchStatus.Action.SubscriptionInfo) {
+                subscriptionInfo = it
+                return@fetchAndValid
+            }
+
+            try {
+                cb?.updateStatus(it)
+            } catch (e: Exception) {
+                cb = null
+
+                Log.w("Report fetch status: $e", e)
+            }
+        }.await()
+
+        return subscriptionInfo
+    }
+
     suspend fun delete(context: Context, uuid: UUID) {
         withContext(NonCancellable) {
             profileLock.withLock {