From ea29017687e4991618340e841accaf7cd18f1b48 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Sat, 7 Dec 2019 15:22:02 +0800
Subject: [PATCH] Revert "keep proxy original order"

This reverts commit b41b9267
---
 app/src/main/java/com/github/kr328/clash/ProxyActivity.kt  | 2 +-
 core/src/main/golang/server/proxies.go                     | 7 -------
 .../java/com/github/kr328/clash/core/model/ProxyPacket.kt  | 4 ++--
 .../com/github/kr328/clash/core/model/RawProxyPacket.kt    | 1 -
 4 files changed, 3 insertions(+), 11 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 0f2fd63..9ae92f7 100644
--- a/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
@@ -101,7 +101,7 @@ class ProxyActivity : BaseActivity() {
                     {
                         it.value.type != ProxyPacket.Type.SELECT
                     }, {
-                        it.value.order
+                        it.value.name
                     })
                 )
                 .flatMap {
diff --git a/core/src/main/golang/server/proxies.go b/core/src/main/golang/server/proxies.go
index fdc9776..1497290 100644
--- a/core/src/main/golang/server/proxies.go
+++ b/core/src/main/golang/server/proxies.go
@@ -76,8 +76,6 @@ func handleQueryProxies(client *net.UnixConn) {
 	root.Mode = tunnel.Instance().Mode().String()
 	root.Proxies = make(map[string]interface{})
 
-	var order int = 0
-
 	for k, p := range proxies {
 		inner, err := p.MarshalJSON()
 
@@ -88,11 +86,6 @@ func handleQueryProxies(client *net.UnixConn) {
 
 		mapping := map[string]interface{}{}
 		json.Unmarshal(inner, &mapping)
-
-		mapping["order"] = order
-
-		order += 1
-
 		root.Proxies[k] = mapping
 	}
 
diff --git a/core/src/main/java/com/github/kr328/clash/core/model/ProxyPacket.kt b/core/src/main/java/com/github/kr328/clash/core/model/ProxyPacket.kt
index 6f632b8..c9fdb2c 100644
--- a/core/src/main/java/com/github/kr328/clash/core/model/ProxyPacket.kt
+++ b/core/src/main/java/com/github/kr328/clash/core/model/ProxyPacket.kt
@@ -8,7 +8,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class ProxyPacket(val mode: String, val proxies: Map<Int, Proxy>): Parcelable {
     @Serializable
-    data class Proxy(val name: String, val type: Type, val order: Int, val now: Int, val all: Set<Int>, val delay: Long)
+    data class Proxy(val name: String, val type: Type, val now: Int, val all: Set<Int>, val delay: Long)
 
     enum class Type {
         SELECT,
@@ -81,7 +81,7 @@ data class ProxyPacket(val mode: String, val proxies: Map<Int, Proxy>): Parcelab
                 val all = entry.value.second.all.mapNotNull { hashed[it]?.first }.toSet()
                 val delay = entry.value.second.history.firstOrNull()?.delay ?: 0
 
-                entry.value.first to Proxy(entry.key, type,entry.value.second.order, now, all, delay)
+                entry.value.first to Proxy(entry.key, type, now, all, delay)
             }
 
             return ProxyPacket(rawProxy.mode, proxies.toMap())
diff --git a/core/src/main/java/com/github/kr328/clash/core/model/RawProxyPacket.kt b/core/src/main/java/com/github/kr328/clash/core/model/RawProxyPacket.kt
index d531da3..ac581ca 100644
--- a/core/src/main/java/com/github/kr328/clash/core/model/RawProxyPacket.kt
+++ b/core/src/main/java/com/github/kr328/clash/core/model/RawProxyPacket.kt
@@ -7,7 +7,6 @@ data class RawProxyPacket(val mode: String, val proxies: Map<String, RawProxy>)
     @Serializable
     data class RawProxy(val type: String,
                         val all: List<String> = emptyList(),
-                        val order: Int = 0,
                         val now: String = "",
                         val history: List<History> = emptyList()) {
         @Serializable