Rename GetQRCode() to GetServerURL()

yangjianxiang · Sep 25, 2017 · a4c4967 · a4c4967
1 parent 55c1918
commit a4c4967
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs
@@ -329,13 +329,13 @@ public void TouchUserRuleFile()
             }
         }
 
-        public string GetQRCodeForCurrentServer()
+        public string GetServerURLForCurrentServer()
         {
             Server server = GetCurrentServer();
-            return GetQRCode(server);
+            return GetServerURL(server);
         }
 
-        public static string GetQRCode(Server server)
+        public static string GetServerURL(Server server)
         {
             string tag = string.Empty;
             string url = string.Empty;

diff --git a/shadowsocks-csharp/View/MenuViewController.cs b/shadowsocks-csharp/View/MenuViewController.cs
@@ -659,7 +659,7 @@ private void StatisticsConfigItem_Click(object sender, EventArgs e)
 
         private void QRCodeItem_Click(object sender, EventArgs e)
         {
-            QRCodeForm qrCodeForm = new QRCodeForm(controller.GetQRCodeForCurrentServer());
+            QRCodeForm qrCodeForm = new QRCodeForm(controller.GetServerURLForCurrentServer());
             //qrCodeForm.Icon = this.Icon;
             // TODO
             qrCodeForm.Show();

diff --git a/shadowsocks-csharp/View/QRCodeForm.cs b/shadowsocks-csharp/View/QRCodeForm.cs
@@ -67,7 +67,7 @@ private void QRCodeForm_Load(object sender, EventArgs e)
             var servers = Configuration.Load();
             var serverDatas = servers.configs.Select(
                 server =>
-                    new KeyValuePair<string, string>(ShadowsocksController.GetQRCode(server), server.FriendlyName())
+                    new KeyValuePair<string, string>(ShadowsocksController.GetServerURL(server), server.FriendlyName())
                 ).ToList();
             listBox1.DataSource = serverDatas;
 

diff --git a/test/UnitTest.cs b/test/UnitTest.cs
@@ -436,7 +436,7 @@ private static void RunGenerateShadowsocksUrlTest(IReadOnlyDictionary<string, Se
                 string expected = testCase.Key;
                 Server config = testCase.Value;
 
-                var actual = ShadowsocksController.GetQRCode(config);
+                var actual = ShadowsocksController.GetServerURL(config);
                 Assert.AreEqual(expected, actual);
             }
         }