Merge branch 'epic/IOS-536-app-redesign-signup-staging' into epic/IOS…

…-536-app-redesign-signup-staging-public-beta
ivpn · Aug 26, 2020 · d5aa046 · d5aa046
2 parents ec49d02 + d6de9b5
commit d5aa046
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 46 deletions.
diff --git a/IVPNClient.xcodeproj/project.pbxproj b/IVPNClient.xcodeproj/project.pbxproj
@@ -2407,7 +2407,7 @@
 				CODE_SIGN_ENTITLEMENTS = "today-extension/today-extension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "today-extension/Info.plist";
@@ -2436,7 +2436,7 @@
 				CODE_SIGN_ENTITLEMENTS = "today-extension/today-extension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "today-extension/Info.plist";
@@ -2464,7 +2464,7 @@
 				CODE_SIGN_ENTITLEMENTS = "today-extension/today-extension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "today-extension/Info.plist";
@@ -2492,7 +2492,7 @@
 				CODE_SIGN_ENTITLEMENTS = "wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2530,7 +2530,7 @@
 				CODE_SIGN_ENTITLEMENTS = "wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2695,7 +2695,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = IVPNClient/IVPNClient.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2767,7 +2767,7 @@
 				CODE_SIGN_ENTITLEMENTS = "openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2798,7 +2798,7 @@
 				CODE_SIGN_ENTITLEMENTS = "wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2868,7 +2868,7 @@
 				CODE_SIGN_ENTITLEMENTS = "openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2909,7 +2909,7 @@
 				CODE_SIGN_ENTITLEMENTS = "openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3055,7 +3055,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = IVPNClient/IVPNClient.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3090,7 +3090,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = IVPNClient/IVPNClient.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = WQXXM75BYN;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/IVPNClient/Scenes/ViewControllers/ServerViewController.swift b/IVPNClient/Scenes/ViewControllers/ServerViewController.swift
@@ -36,10 +36,25 @@ class ServerViewController: UITableViewController {
     // MARK: - Properties -
 
     var isExitServer = false
-    var collection = [VPNServer]()
     var filteredCollection = [VPNServer]()
     weak var serverDelegate: ServerViewControllerDelegate?
 
+    var collection:[VPNServer] {
+        var list = [VPNServer]()
+
+        if isSearchActive {
+            list = filteredCollection
+        } else {
+            list = Application.shared.serverList.servers
+        }
+
+        if !UserDefaults.shared.isMultiHop {
+            list = [VPNServer(gateway: "", countryCode: "", country: "", city: "", fastest: true)] + list
+        }
+
+        return list
+    }
+
     var isSearchActive: Bool {
         return !searchBar.text!.isEmpty
     }
@@ -62,9 +77,8 @@ class ServerViewController: UITableViewController {
             guard index > -1 else { return }
 
             let sort = ServersSort.allCases[index]
-
             UserDefaults.shared.set(sort.rawValue, forKey: UserDefaults.Key.serversSort)
-            self.initCollection()
+            Application.shared.serverList.sortServers()
             self.filteredCollection = VPNServerList.sort(self.filteredCollection)
             self.tableView.reloadData()
         }
@@ -75,7 +89,7 @@ class ServerViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         initNavigationBar()
-        initCollection()
+        Application.shared.serverList.sortServers()
         tableView.keyboardDismissMode = .onDrag
     }
 
@@ -110,7 +124,8 @@ class ServerViewController: UITableViewController {
     }
 
     @objc func pingDidComplete() {
-        initCollection()
+        Application.shared.serverList.sortServers()
+        filteredCollection = VPNServerList.sort(self.filteredCollection)
         tableView.reloadData()
     }
 
@@ -132,16 +147,6 @@ class ServerViewController: UITableViewController {
         searchBar.backgroundImage = UIImage()
     }
 
-    private func initCollection() {
-        Application.shared.serverList.sortServers()
-
-        collection = [VPNServer(gateway: "", countryCode: "", country: "", city: "", fastest: true)] + Application.shared.serverList.servers
-
-        if UserDefaults.shared.isMultiHop {
-            collection = Application.shared.serverList.servers
-        }
-    }
-
     private func enableRefreshControl() {
         refreshControl = UIRefreshControl()
         refreshControl?.addTarget(self, action: #selector(self.refresh), for: UIControl.Event.valueChanged)
@@ -160,20 +165,14 @@ class ServerViewController: UITableViewController {
 extension ServerViewController {
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if isSearchActive {
-            return filteredCollection.count
-        } else {
-            return collection.count
-        }
+        return collection.count
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "ServerTableViewCell", for: indexPath) as! ServerTableViewCell
-        let server = isSearchActive ? filteredCollection[indexPath.row] : collection[indexPath.row]
-
         cell.isMultiHop = UserDefaults.shared.isMultiHop
         cell.indexPath = indexPath
-        cell.viewModel = VPNServerViewModel(server: server)
+        cell.viewModel = VPNServerViewModel(server: collection[indexPath.row])
         cell.serverToValidate = isExitServer ? Application.shared.settings.selectedServer : Application.shared.settings.selectedExitServer
         cell.selectedServer = isExitServer ? Application.shared.settings.selectedExitServer : Application.shared.settings.selectedServer
 
@@ -189,7 +188,7 @@ extension ServerViewController {
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         guard indexPath.row < collection.count else { return }
 
-        let server = isSearchActive ? filteredCollection[indexPath.row] : collection[indexPath.row]
+        let server = collection[indexPath.row]
         var secondServer = Application.shared.settings.selectedExitServer
         var serverDifferentToSelectedServer = server !== Application.shared.settings.selectedServer
 
@@ -262,18 +261,15 @@ extension ServerViewController {
 extension ServerViewController: UISearchBarDelegate {
 
     func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
-        filteredCollection.removeAll(keepingCapacity: false)
+        let collection = Application.shared.serverList.servers
 
+        filteredCollection.removeAll(keepingCapacity: false)
         filteredCollection = collection.filter { (server: VPNServer) -> Bool in
             return server.city.lowercased().contains(searchBar.text!.lowercased())
         }
 
         filteredCollection = VPNServerList.sort(filteredCollection)
 
-        if !UserDefaults.shared.isMultiHop {
-            filteredCollection = [VPNServer(gateway: "", countryCode: "", country: "", city: "", fastest: true)] + filteredCollection
-        }
-
         tableView.reloadData()
     }
 

diff --git a/UITests/Info.plist b/UITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>26</string>
 </dict>
 </plist>
diff --git a/UnitTests/Info.plist b/UnitTests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>26</string>
 </dict>
 </plist>
diff --git a/openvpn-tunnel-provider/Info.plist b/openvpn-tunnel-provider/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>26</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/today-extension/Info.plist b/today-extension/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>26</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>

diff --git a/wireguard-tunnel-provider/Info.plist b/wireguard-tunnel-provider/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>26</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>