From d6e3fc5c912eba38464c0e67e6a74933b5eca317 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 29 Jan 2026 14:51:59 +0800
Subject: [PATCH] Move enums from dto to enums package and update imports

---
 .../app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt    | 1 +
 .../app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt    | 1 +
 .../main/java/com/v2ray/ang/{dto => enums}/EConfigType.kt | 5 ++---
 .../main/java/com/v2ray/ang/{dto => enums}/Language.kt    | 2 +-
 .../main/java/com/v2ray/ang/{dto => enums}/NetworkType.kt | 2 +-
 .../java/com/v2ray/ang/{dto => enums}/PermissionType.kt   | 2 +-
 .../main/java/com/v2ray/ang/{dto => enums}/RoutingType.kt | 2 +-
 .../v2ray/ang/{dto => enums}/VpnInterfaceAddressConfig.kt | 2 +-
 V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt  | 2 +-
 V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt    | 2 +-
 V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt    | 2 +-
 .../app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt   | 4 ++--
 .../app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt | 4 ++--
 V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt   | 2 +-
 V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt  | 4 ++--
 V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt   | 2 +-
 V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt   | 5 ++---
 .../app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt   | 2 +-
 .../main/java/com/v2ray/ang/handler/AngConfigManager.kt   | 2 +-
 .../main/java/com/v2ray/ang/handler/SettingsManager.kt    | 8 ++++----
 .../java/com/v2ray/ang/handler/V2RayServiceManager.kt     | 2 +-
 .../main/java/com/v2ray/ang/handler/V2rayConfigManager.kt | 4 ++--
 .../main/java/com/v2ray/ang/helper/PermissionHelper.kt    | 2 +-
 .../src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt | 2 +-
 .../src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt  | 2 +-
 .../app/src/main/java/com/v2ray/ang/ui/MainActivity.kt    | 4 ++--
 .../app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt  | 4 ++--
 .../java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt   | 2 +-
 .../src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt | 2 +-
 .../src/test/java/com/v2ray/ang/fmt/ShadowsocksFmtTest.kt | 2 +-
 30 files changed, 41 insertions(+), 41 deletions(-)
 rename V2rayNG/app/src/main/java/com/v2ray/ang/{dto => enums}/EConfigType.kt (95%)
 rename V2rayNG/app/src/main/java/com/v2ray/ang/{dto => enums}/Language.kt (93%)
 rename V2rayNG/app/src/main/java/com/v2ray/ang/{dto => enums}/NetworkType.kt (92%)
 rename V2rayNG/app/src/main/java/com/v2ray/ang/{dto => enums}/PermissionType.kt (97%)
 rename V2rayNG/app/src/main/java/com/v2ray/ang/{dto => enums}/RoutingType.kt (95%)
 rename V2rayNG/app/src/main/java/com/v2ray/ang/{dto => enums}/VpnInterfaceAddressConfig.kt (98%)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt
index 0e6f577c..dd05ab83 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt
@@ -5,6 +5,7 @@ import com.v2ray.ang.AppConfig.PORT_SOCKS
 import com.v2ray.ang.AppConfig.TAG_BLOCKED
 import com.v2ray.ang.AppConfig.TAG_DIRECT
 import com.v2ray.ang.AppConfig.TAG_PROXY
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.util.Utils
 
 data class ProfileItem(
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
index 9455e58e..ad1685a0 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
@@ -2,6 +2,7 @@ package com.v2ray.ang.dto
 
 import com.google.gson.annotations.SerializedName
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.enums.EConfigType
 
 data class V2rayConfig(
     var remarks: String? = null,
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/EConfigType.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/EConfigType.kt
similarity index 95%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/dto/EConfigType.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/enums/EConfigType.kt
index ee8f8d09..b27feb64 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/EConfigType.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/EConfigType.kt
@@ -1,8 +1,7 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 import com.v2ray.ang.AppConfig
 
-
 enum class EConfigType(val value: Int, val protocolScheme: String) {
     VMESS(1, AppConfig.VMESS),
     CUSTOM(2, AppConfig.CUSTOM),
@@ -21,4 +20,4 @@ enum class EConfigType(val value: Int, val protocolScheme: String) {
     companion object {
         fun fromInt(value: Int) = entries.firstOrNull { it.value == value }
     }
-}
+}
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/Language.kt
similarity index 93%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/enums/Language.kt
index 46333d06..cc89c978 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/Language.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 enum class Language(val code: String) {
     AUTO("auto"),
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/NetworkType.kt
similarity index 92%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/enums/NetworkType.kt
index 9931bfe6..3574be5d 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/NetworkType.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 enum class NetworkType(val type: String) {
     TCP("tcp"),
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/PermissionType.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt
similarity index 97%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/dto/PermissionType.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt
index 8eb5b08e..9defe638 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/PermissionType.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 import android.Manifest
 import android.os.Build
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/RoutingType.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/RoutingType.kt
similarity index 95%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/dto/RoutingType.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/enums/RoutingType.kt
index 1128b593..3b3a1f38 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/RoutingType.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/RoutingType.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 enum class RoutingType(val fileName: String) {
     WHITE("custom_routing_white"),
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/VpnInterfaceAddressConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/VpnInterfaceAddressConfig.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/dto/VpnInterfaceAddressConfig.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/enums/VpnInterfaceAddressConfig.kt
index d2137ead..c8ffe991 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/VpnInterfaceAddressConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/enums/VpnInterfaceAddressConfig.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 /**
  * VPN interface address configuration enum class
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt
index 30fc0750..96d1adeb 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt
@@ -1,6 +1,6 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.util.JsonUtil
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
index e657fa47..f541cdb3 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
@@ -1,7 +1,7 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
index 8c641f24..29fba01f 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
@@ -1,6 +1,6 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.isNotNullEmpty
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
index 49aea271..1b461b0c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
index 083cf13b..ce644c75 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
@@ -2,8 +2,8 @@ package com.v2ray.ang.fmt
 
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
index 4e11e7c0..f629b9f3 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
@@ -1,6 +1,6 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
index e836171c..70280c57 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
index d9605c59..be5e90c4 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
@@ -1,7 +1,7 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
index f6cfe7ff..01ce09fb 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
@@ -3,13 +3,12 @@ package com.v2ray.ang.fmt
 import android.text.TextUtils
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.dto.VmessQRCode
 import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
index 5da31409..bc07b114 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
@@ -2,7 +2,7 @@ package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
index 7f87dd05..4b716949 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
@@ -7,7 +7,7 @@ import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.dto.SubscriptionItem
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
index 7e610d88..35cc4c5f 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
@@ -11,13 +11,13 @@ import com.v2ray.ang.AppConfig.GEOIP_PRIVATE
 import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
 import com.v2ray.ang.AppConfig.TAG_DIRECT
 import com.v2ray.ang.AppConfig.VPN
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.Language
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.Language
 import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.RoutingType
+import com.v2ray.ang.enums.RoutingType
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.VpnInterfaceAddressConfig
+import com.v2ray.ang.enums.VpnInterfaceAddressConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerList
 import com.v2ray.ang.util.JsonUtil
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt
index e7641349..5871365c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt
@@ -10,7 +10,7 @@ import android.util.Log
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.service.ServiceControl
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
index e8196717..117453cf 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
@@ -6,8 +6,8 @@ import android.util.Log
 import com.google.gson.JsonArray
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.ConfigResult
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.V2rayConfig
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/PermissionHelper.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/PermissionHelper.kt
index aa500ec4..4c29126a 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/PermissionHelper.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/PermissionHelper.kt
@@ -6,7 +6,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.PermissionType
+import com.v2ray.ang.enums.PermissionType
 import com.v2ray.ang.extension.toast
 
 /**
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt
index 7bac30af..f837ff6d 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt
@@ -15,7 +15,7 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.FragmentGroupServerBinding
 import com.v2ray.ang.databinding.ItemQrcodeBinding
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt
index 95a28d60..43fc1076 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt
@@ -2,7 +2,7 @@ package com.v2ray.ang.ui
 
 import android.net.Uri
 import android.os.Bundle
-import com.v2ray.ang.dto.PermissionType
+import com.v2ray.ang.enums.PermissionType
 import com.v2ray.ang.helper.FileChooserHelper
 import com.v2ray.ang.helper.PermissionHelper
 import com.v2ray.ang.helper.QRCodeScannerHelper
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
index 5462b9e2..7b35b848 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
@@ -24,8 +24,8 @@ import com.google.android.material.tabs.TabLayoutMediator
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityMainBinding
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.PermissionType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.PermissionType
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.handler.AngConfigManager
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
index 8852f972..8c7cc1c6 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
@@ -20,8 +20,8 @@ import com.v2ray.ang.AppConfig.TLS
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_MTU
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.toast
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
index a73275ce..c7df349a 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
@@ -11,7 +11,7 @@ import com.blacksquircle.ui.language.json.JsonLanguage
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt
index 1ceb0745..b1c3ebab 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt
@@ -8,7 +8,7 @@ import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerGroupBinding
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
diff --git a/V2rayNG/app/src/test/java/com/v2ray/ang/fmt/ShadowsocksFmtTest.kt b/V2rayNG/app/src/test/java/com/v2ray/ang/fmt/ShadowsocksFmtTest.kt
index 21c3328c..4185b4a4 100644
--- a/V2rayNG/app/src/test/java/com/v2ray/ang/fmt/ShadowsocksFmtTest.kt
+++ b/V2rayNG/app/src/test/java/com/v2ray/ang/fmt/ShadowsocksFmtTest.kt
@@ -2,7 +2,7 @@ package com.v2ray.ang.fmt
 
 import android.util.Base64
 import android.util.Log
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import org.junit.After
 import org.junit.Assert.assertEquals