Setting of proxy in rules are lost after backup restore. Closes #418

Author: salarcode

src/core/Settings.ts

@@ -518,7 +518,8 @@ export class Settings {
 
 	public static validateProxyServer(
 		server: ProxyServer,
-		checkExistingName: boolean = true,
+		nameShouldNotExist: boolean = true,
+		nameShouldExist: boolean = false
 	): {
 		success: boolean;
 		exist?: boolean;
@@ -542,14 +543,25 @@ export class Settings {
 		if (!server.name) {
 			return { success: false, message: api.i18n.getMessage('settingsServerNameRequired') };
 		} else if (me.current) {
-			if (checkExistingName) {
+			if (nameShouldNotExist || nameShouldExist) {
 				const currentServers = me.current.proxyServers;
 
+				var found = false;
 				for (let srv of currentServers) {
 					if (srv.name == server.name) {
-						return { success: false, exist: true, message: `Server name ${server.name} already exists` };
+						if (nameShouldNotExist) {
+							return { success: false, exist: true, message: `Server name ${server.name} already exists` };
+						}
+						else {
+							found = true;
+							break;
+						}
 					}
 				}
+
+				if (!found && nameShouldExist) {
+					return { success: false, exist: false, message: `Server name ${server.name} does not exist` };
+				}
 			}
 		}
 

src/core/definitions.ts

@@ -837,7 +837,7 @@ export class ProxyRule implements Cloneable {
 			this.whiteList = source['whiteList'] == true ? true : false;
 
 		if (this.proxy) {
-			if (!Settings.validateProxyServer(this.proxy).success) {
+			if (!Settings.validateProxyServer(this.proxy, false, true).success) {
 				this.proxy = null;
 			}
 		}

src/lib/ProxyImporter.ts

@@ -275,7 +275,7 @@ export const ProxyImporter = {
 				item.username = proxy["username"];
 				item.password = proxy["password"];
 
-				if (!Settings.validateProxyServer(item).success)
+				if (!Settings.validateProxyServer(item, true).success)
 					continue;
 
 				resultProxies.push(item);