remove default Subscribe, fix merge server bug

Author: breakwa11

shadowsocks-csharp/Model/Configuration.cs

@@ -389,13 +389,10 @@ public Configuration()
             sysProxyMode = (int)ProxyMode.Global;
             proxyRuleMode = (int)ProxyRuleMode.BypassLanAndChina;
 
-            //nodeFeedURL = DEFAULT_FEED_URL;
-            //nodeFeedGroup = "";
             nodeFeedAutoUpdate = true;
 
             serverSubscribes = new List<ServerSubscribe>()
             {
-                new ServerSubscribe()
             };
 
             configs = new List<Server>()

shadowsocks-csharp/View/ConfigForm.cs

@@ -233,18 +233,11 @@ private int SaveOldSelectedServer()
                     ret = 1; // display changed
                 }
                 Server oldServer = _modifiedConfiguration.configs[_oldSelectedIndex];
-                if (oldServer.server == server.server
-                    && oldServer.server_port == server.server_port
-                    && oldServer.password == server.password
-                    && oldServer.method == server.method
-                    )
+                if (oldServer.isMatchServer(server))
                 {
-                    if (oldServer.obfs == server.obfs
-                        && oldServer.obfsparam == server.obfsparam)
-                        server.setObfsData(oldServer.getObfsData());
-                    if (oldServer.protocol == server.protocol
-                        && oldServer.protocolparam == server.protocolparam)
-                        server.setProtocolData(oldServer.getProtocolData());
+                    server.setObfsData(oldServer.getObfsData());
+                    server.setProtocolData(oldServer.getProtocolData());
+                    server.enable = oldServer.enable;
                 }
                 _modifiedConfiguration.configs[_oldSelectedIndex] = server;