Merge pull request #257 from ivpn/bugfix/empty-openvpn-server-list

Server list is empty when OpenVPN is selected
ivpn · May 16, 2022 · c85e4b1 · c85e4b1
2 parents 34058c1 + 9e6108e
commit c85e4b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/IVPNClient/Models/VPNServer.swift b/IVPNClient/Models/VPNServer.swift
@@ -59,6 +59,16 @@ class VPNServer {
     }
 
     var supportsIPv6: Bool {
+        for host in hosts {
+            if host.ipv6 == nil {
+                return false
+            }
+        }
+
+        return true
+    }
+
+    var enabledIPv6: Bool {
         for host in hosts {
             if !(host.ipv6?.localIP.isEmpty ?? true) {
                 return true

diff --git a/IVPNClient/Models/VPNServerList.swift b/IVPNClient/Models/VPNServerList.swift
@@ -157,9 +157,9 @@ class VPNServerList {
     }()
 
     func getServers() -> [VPNServer] {
-        guard UserDefaults.standard.showIPv4Servers || !UserDefaults.shared.isIPv6 else {
+        if UserDefaults.shared.isIPv6 && !UserDefaults.standard.showIPv4Servers {
             return servers.filter { (server: VPNServer) -> Bool in
-                return server.supportsIPv6
+                return server.enabledIPv6 || !server.supportsIPv6
             }
         }
 

diff --git a/IVPNClient/ViewModels/VPNServerViewModel.swift b/IVPNClient/ViewModels/VPNServerViewModel.swift
@@ -111,7 +111,7 @@ struct VPNServerViewModel {
     }
 
     var showIPv6Label: Bool {
-        return UserDefaults.standard.showIPv4Servers && UserDefaults.shared.isIPv6 && server.supportsIPv6 && !(server.random && Application.shared.connectionManager.status.isDisconnected())
+        return UserDefaults.standard.showIPv4Servers && UserDefaults.shared.isIPv6 && server.enabledIPv6 && !(server.random && Application.shared.connectionManager.status.isDisconnected())
     }
 
     // MARK: - Initialize -