From 4ba05faf02b189b6932be4db0e3c8a63ec83d4a6 Mon Sep 17 00:00:00 2001
From: QxQ <59914293+U-v-U@users.noreply.github.com>
Date: Mon, 8 Feb 2021 00:38:25 +0800
Subject: [PATCH] move SIP008 before Base64 in the subscription type list

---
 makespec/BUILDVERSION                                       | 2 +-
 .../subscription-adapters/core/SubscriptionAdapter.hpp      | 6 +++---
 src/ui/widgets/windows/w_GroupManager.cpp                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
index 7a3cd3d7..8a6742b0 100644
--- a/makespec/BUILDVERSION
+++ b/makespec/BUILDVERSION
@@ -1 +1 @@
-6141
+6142
diff --git a/src/plugins/subscription-adapters/core/SubscriptionAdapter.hpp b/src/plugins/subscription-adapters/core/SubscriptionAdapter.hpp
index 3f8ee79b..1c7d99e2 100644
--- a/src/plugins/subscription-adapters/core/SubscriptionAdapter.hpp
+++ b/src/plugins/subscription-adapters/core/SubscriptionAdapter.hpp
@@ -41,9 +41,9 @@ class BuiltinSubscriptionAdapterInterface : public SubscriptionInterface
     QList<Qv2rayPlugin::ProtocolInfoObject> SupportedSubscriptionTypes() const override
     {
         // "simple_base64" = magic value in Qv2ray main application
-        return {                                                        //
-                 ProtocolInfoObject{ "simple_base64", "Basic Base64" }, //
-                 ProtocolInfoObject{ "sip008", "SIP008" }
+        return {
+            ProtocolInfoObject{ "sip008", "SIP008" },             //
+            ProtocolInfoObject{ "simple_base64", "Basic Base64" } //
         };
     }
 
diff --git a/src/ui/widgets/windows/w_GroupManager.cpp b/src/ui/widgets/windows/w_GroupManager.cpp
index 10595449..3b61cfed 100644
--- a/src/ui/widgets/windows/w_GroupManager.cpp
+++ b/src/ui/widgets/windows/w_GroupManager.cpp
@@ -52,7 +52,7 @@ GroupManager::GroupManager(QWidget *parent) : QvDialog("GroupManager", parent)
         const auto types = subscriptionAdapterInterface->SupportedSubscriptionTypes();
         for (const auto &type : types)
         {
-            subscriptionTypeCB->addItem(type.displayName, type.protocol);
+            subscriptionTypeCB->addItem(pluginInfo->metadata.Name + ": " + type.displayName, type.protocol);
         }
     }