Merge branch 'master' into PIA-675_tvOS_compatibility

PIA VPN.xcodeproj/project.pbxproj

@@ -2389,6 +2389,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		69B70AAE2ACBF51C0072A09D /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		8269A6D3251CB5E0000B4DBF /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;

PIA VPN/DNSList.swift

@@ -190,6 +190,22 @@ class DNSList: NSObject {
         return false
     }
 
+    /// Return if a custom DNS is set for given protocol and its configured DNS servers
+    func hasCustomDNS(for vpnType: String, in dnsServers: [String]) -> Bool {
+        guard vpnType != IKEv2Profile.vpnType && !dnsServers.isEmpty else {
+            return false
+        }
+
+        for dns in self.dnsList {
+            for (_, ipsList) in dns {
+                if dnsServers == ipsList {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
     /// Updates the content of the dnsList object into the plist
     private func updatePlist() {
         (self.dnsList as NSArray).write(toFile: self.plistPathInDocument,

PIA VPN/SwiftGen+Strings.swift

@@ -1835,7 +1835,11 @@ internal enum L10n {
 // MARK: - Implementation Details
 
 extension L10n {
+<<<<<<< HEAD
   private static func tr(_ table: String, _ key: String, _ args: CVarArg..., fallback value: String) -> String {
+=======
+  private static func tr(_ table: String, _ key: String, _ args: CVarArg..., fallback value: String? = nil) -> String {
+>>>>>>> master
     let format = BundleToken.bundle.localizedString(forKey: key, value: value, table: table)
     return String(format: format, locale: Locale.current, arguments: args)
   }