don't use enum class for Proxy.Type

Author: wwqgtxx

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
                                 )

core/src/main/golang/.idea/codeStyles/Project.xml

@@ -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,13 +190,15 @@ func convertProxies(proxies []C.Proxy, uiSubtitlePattern *regexp2.Regexp) []*Pro
 				break
 			}
 		}
+		_, isGroup := p.Adapter().(outboundgroup.ProxyGroup)
 
 		result = append(result, &Proxy{
 			Name:     name,
 			Title:    strings.TrimSpace(title),
 			Subtitle: strings.TrimSpace(subtitle),
 			Type:     p.Type().String(),
 			Delay:    int(p.LastDelayForTestUrl(testURL)),
+			IsGroup:  isGroup,
 		})
 	}
 	return result
@@ -228,13 +231,15 @@ func collectProviders(providers []provider.ProxyProvider, uiSubtitlePattern *reg
 					break
 				}
 			}
+			_, isGroup := px.Adapter().(outboundgroup.ProxyGroup)
 
 			result = append(result, &Proxy{
 				Name:     name,
 				Title:    strings.TrimSpace(title),
 				Subtitle: strings.TrimSpace(subtitle),
 				Type:     px.Type().String(),
 				Delay:    int(px.LastDelayForTestUrl(testURL)),
+				IsGroup:  isGroup,
 			})
 		}
 	}

core/src/main/golang/native/tunnel/proxies.go

@@ -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> {

core/src/main/java/com/github/kr328/clash/core/Clash.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)
     }

core/src/main/java/com/github/kr328/clash/core/model/Proxy.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)
     }

core/src/main/java/com/github/kr328/clash/core/model/ProxyGroup.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)
             }

design/src/main/java/com/github/kr328/clash/design/adapter/ProxyPageAdapter.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 { "*" }
                     )
                 }