Adjust GroupProfileManager

Author: 2dust

v2rayN/ServiceLib/Manager/GroupProfileManager.cs

@@ -12,7 +12,7 @@ public static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extr
         return await HasCycle(indexId, extraInfo, new HashSet<string>(), new HashSet<string>());
     }
 
-    public static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extraInfo, HashSet<string> visited, HashSet<string> stack)
+    private static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extraInfo, HashSet<string> visited, HashSet<string> stack)
     {
         if (indexId.IsNullOrEmpty() || extraInfo == null)
         {
@@ -75,20 +75,21 @@ public static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extr
         return (await GetChildProfileItemsByProtocolExtra(protocolExtra), protocolExtra);
     }
 
-    public static async Task<List<ProfileItem>> GetChildProfileItemsByProtocolExtra(ProtocolExtraItem? protocolExtra)
+    private static async Task<List<ProfileItem>> GetChildProfileItemsByProtocolExtra(ProtocolExtraItem? protocolExtra)
     {
         if (protocolExtra == null)
         {
             return new();
         }
-        var items = await GetSelectedChildProfileItems(protocolExtra);
-        var subItems = await GetSubChildProfileItems(protocolExtra);
-        items.AddRange(subItems);
+
+        var items = new List<ProfileItem>();
+        items.AddRange(await GetSubChildProfileItems(protocolExtra));
+        items.AddRange(await GetSelectedChildProfileItems(protocolExtra));
 
         return items;
     }
 
-    public static async Task<List<ProfileItem>> GetSelectedChildProfileItems(ProtocolExtraItem? extra)
+    private static async Task<List<ProfileItem>> GetSelectedChildProfileItems(ProtocolExtraItem? extra)
     {
         if (extra == null || extra.ChildItems.IsNullOrEmpty())
         {
@@ -105,10 +106,10 @@ public static async Task<List<ProfileItem>> GetSelectedChildProfileItems(Protoco
                 p.ConfigType != EConfigType.Custom
             )
             .ToList();
-        return childProfiles;
+        return childProfiles ?? new();
     }
 
-    public static async Task<List<ProfileItem>> GetSubChildProfileItems(ProtocolExtraItem? extra)
+    private static async Task<List<ProfileItem>> GetSubChildProfileItems(ProtocolExtraItem? extra)
     {
         if (extra == null || extra.SubChildItems.IsNullOrEmpty())
         {