Fix #7412: VPN Region Selector related changes (#7431)

brave · May 10, 2023 · 6c03710 · 6c03710
1 parent bb503f1
commit 6c03710
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 27 deletions.
diff --git a/App/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/App/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/GuardianFirewall/GuardianConnect",
       "state" : {
-        "revision" : "5a00da66f1368e5c325489676fe9281ec98c3a8f",
-        "version" : "1.8.4-dev-2"
+        "revision" : "cf99f1babca17a3d94ea20e2fc56cc48dfd65575",
+        "version" : "1.8.4"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -60,7 +60,7 @@ var package = Package(
     .package(url: "https://github.com/apple/swift-algorithms", from: "1.0.0"),
     .package(url: "https://github.com/devxoul/Then", from: "2.7.0"),
     .package(url: "https://github.com/mkrd/Swift-BigInt", from: "2.0.0"),
-    .package(url: "https://github.com/GuardianFirewall/GuardianConnect", exact: "1.8.4-dev-2"),
+    .package(url: "https://github.com/GuardianFirewall/GuardianConnect", exact: "1.8.4"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.6.0"),
     .package(name: "Static", path: "ThirdParty/Static"),
   ],

diff --git a/Sources/BraveVPN/BraveVPN.swift b/Sources/BraveVPN/BraveVPN.swift
@@ -379,7 +379,11 @@ public class BraveVPN {
   /// Return the region last activated with the details
   /// It will give region details for automatic
   public static var activatedRegion: GRDRegion? {
-    helper.selectedRegion ?? lastKnownRegion
+    guard let isoCode = helper.selectedRegion?.countryISOCode, isoCode.isEmpty else {
+      return helper.selectedRegion
+    }
+
+    return lastKnownRegion
   }
 
   /// Switched to use an automatic region, region closest to user location.

diff --git a/Sources/BraveVPN/BraveVPNPickerViewController.swift b/Sources/BraveVPN/BraveVPNPickerViewController.swift
@@ -12,40 +12,39 @@ import GuardianConnect
 
 public class BraveVPNPickerViewController: UIViewController {
 
-  private var overlayView: UIView?
   let tableView: UITableView = .init(frame: .zero, style: .insetGrouped)
 
-  deinit {
-    NotificationCenter.default.removeObserver(self)
+  private lazy var overlayView = UIView().then {
+    $0.backgroundColor = UIColor.black.withAlphaComponent(0.5)
+
+    let activityIndicator = UIActivityIndicatorView().then {
+      $0.style = .large
+      $0.color = .white
+      $0.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+      $0.startAnimating()
+    }
+
+    $0.addSubview(activityIndicator)
   }
 
   var isLoading: Bool = false {
     didSet {
-      overlayView?.removeFromSuperview()
 
       navigationItem.hidesBackButton = isLoading
 
       // Prevent dismissing the modal by swipe when the VPN is being configured
       navigationController?.isModalInPresentation = isLoading
 
-      if !isLoading { return }
-
-      let overlay = UIView().then {
-        $0.backgroundColor = UIColor.black.withAlphaComponent(0.5)
-        let activityIndicator = UIActivityIndicatorView().then { indicator in
-          indicator.startAnimating()
-          indicator.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+      if isLoading {
+        view.addSubview(overlayView)
+        overlayView.snp.makeConstraints {
+          $0.edges.equalToSuperview()
+        }
+      } else {
+        if overlayView.isDescendant(of: view) {
+          overlayView.removeFromSuperview()
         }
-
-        $0.addSubview(activityIndicator)
-      }
-
-      view.addSubview(overlay)
-      overlay.snp.makeConstraints {
-        $0.edges.equalToSuperview()
       }
-
-      overlayView = overlay
     }
   }
 
@@ -73,6 +72,10 @@ public class BraveVPNPickerViewController: UIViewController {
     tableView.reloadData()
   }
 
+  deinit {
+    NotificationCenter.default.removeObserver(self)
+  }
+
   @objc func vpnConfigChanged(notification: NSNotification) { }
 
   func showSuccessAlert(text: String) {

diff --git a/Sources/BraveVPN/BraveVPNSettingsViewController.swift b/Sources/BraveVPN/BraveVPNSettingsViewController.swift
@@ -54,9 +54,11 @@ public class BraveVPNSettingsViewController: TableViewController {
 
       let overlay = UIView().then {
         $0.backgroundColor = UIColor.black.withAlphaComponent(0.5)
-        let activityIndicator = UIActivityIndicatorView().then { indicator in
-          indicator.startAnimating()
-          indicator.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        let activityIndicator = UIActivityIndicatorView().then {
+          $0.style = .large
+          $0.color = .white
+          $0.startAnimating()
+          $0.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         }
 
         $0.addSubview(activityIndicator)

diff --git a/Sources/BraveVPN/VPNRegion.swift b/Sources/BraveVPN/VPNRegion.swift
@@ -36,6 +36,10 @@ extension GRDRegion {
       }
     }
 
+    if unicodeScalarView.isEmpty {
+      return nil
+    }
+
     return Image(uiImage: unicodeScalarView.image())
   }
 }