Merge branch 'develop'

ivpn · Dec 8, 2022 · 675de27 · 675de27
2 parents 15b1841 + 30b72e6
commit 675de27
Show file tree

Hide file tree

Showing 45 changed files with 449 additions and 396 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.7.1 - 2022-12-08  
+
+[IMPROVED] Support for Split View and Slide Over mode on iPadOS  
+[IMPROVED] Upgraded app diagnostic logs  
+[FIXED] Crash on app launch caused by Ping service  
+[FIXED] Montreal location not showing all available hosts  
+[FIXED] Minor bug fixes  
+
 ## 2.7.0 - 2022-11-23  
 
 [NEW] Ability to connect to a specific host in a location  

diff --git a/IVPNClient.xcodeproj/project.pbxproj b/IVPNClient.xcodeproj/project.pbxproj
diff --git a/IVPNClient/AppDelegate.swift b/IVPNClient/AppDelegate.swift
@@ -166,6 +166,10 @@ class AppDelegate: UIResponder {
                 }
             })
         case Config.urlTypeLogin:
+            if let _ = UIApplication.topViewController() as? LoginViewController {
+                return
+            }
+
             if let topViewController = UIApplication.topViewController() {
                 topViewController.present(NavigationManager.getLoginViewController(), animated: true, completion: nil)
             }
@@ -350,7 +354,7 @@ extension AppDelegate: UIApplicationDelegate {
                 }
             }
         default:
-            log(info: "No such user activity")
+            log(.info, message: "No such user activity")
         }
 
         return false

diff --git a/IVPNClient/Config/Config.swift b/IVPNClient/Config/Config.swift
@@ -54,6 +54,7 @@ struct Config {
 
     // Files and Directories
     static let serversListCacheFileName = "servers_cache1.json"
+    static let appLogFile = "AppLogs.txt"
     static let openVPNLogFile = "OpenVPNLogs.txt"
     static let wireGuardLogFile = "WireGuardLogs.txt"
 

diff --git a/IVPNClient/Config/servers.json b/IVPNClient/Config/servers.json
diff --git a/IVPNClient/IVPNClient-Bridging-Header.h b/IVPNClient/IVPNClient-Bridging-Header.h
@@ -1,2 +1,2 @@
 #include "../WireGuardKitC/WireGuardKitC.h"
-#include "../wireguard-tunnel-provider/WireGuard/Shared/Logging/ringlogger.h"
+#include "Utilities/Logging/ringlogger.h"
diff --git a/IVPNClient/Managers/ApiService+Ext.swift b/IVPNClient/Managers/ApiService+Ext.swift
@@ -32,7 +32,7 @@ extension ApiService {
 
         UIApplication.shared.isNetworkActivityIndicatorVisible = true
 
-        log(info: "Fetching servers list...")
+        log(.info, message:  "Load servers")
 
         APIClient().perform(request) { result in
             switch result {
@@ -47,16 +47,16 @@ extension ApiService {
                     let serversList = VPNServerList(withJSONData: data, storeInCache: storeInCache)
 
                     if serversList.servers.count > 0 {
-                        log(info: "Fetching servers list completed successfully")
+                        log(.info, message: "Load servers success")
                         completion(.success(serversList))
                         return
                     }
                 }
 
-                log(info: "Error updating servers list (probably parsing error)")
+                log(.info, message: "Load servers error (probably parsing error)")
                 completion(.error)
             case .failure:
-                log(info: "Error fetching servers list")
+                log(.info, message: "Load servers error")
                 completion(.error)
             }
         }

diff --git a/IVPNClient/Managers/ApiService.swift b/IVPNClient/Managers/ApiService.swift
@@ -49,7 +49,7 @@ class ApiService {
 
         UIApplication.shared.isNetworkActivityIndicatorVisible = true
 
-        log(info: "\(requestName) started")
+        log(.info, message: "\(requestName) started")
 
         APIClient().perform(request) { result in
             DispatchQueue.main.async {
@@ -64,23 +64,23 @@ class ApiService {
                         do {
                             let successResponse = try decoder.decode(T.self, from: data)
                             completion(.success(successResponse))
-                            log(info: "\(requestName) success")
+                            log(.info, message: "\(requestName) success")
                             return
                         } catch {}
 
                         do {
                             let errorResponse = try decoder.decode(ErrorResult.self, from: data)
                             let error = self.getServiceError(message: errorResponse.message, code: errorResponse.status)
                             completion(.failure(error))
-                            log(info: "\(requestName) error response")
+                            log(.info, message: "\(requestName) error response")
                             return
                         } catch {}
                     }
 
                     completion(.failure(nil))
-                    log(info: "\(requestName) parse error")
+                    log(.info, message: "\(requestName) parse error")
                 case .failure(let error):
-                    log(info: "\(requestName) failure")
+                    log(.info, message: "\(requestName) failure")
                     completion(.failure(error))
                 }
             }
@@ -97,7 +97,7 @@ class ApiService {
 
         UIApplication.shared.isNetworkActivityIndicatorVisible = true
 
-        log(info: "\(requestName) started")
+        log(.info, message: "\(requestName) started")
 
         APIClient().perform(request) { result in
             DispatchQueue.main.async {
@@ -112,22 +112,22 @@ class ApiService {
                         do {
                             let successResponse = try decoder.decode(T.self, from: data)
                             completion(.success(successResponse))
-                            log(info: "\(requestName) success")
+                            log(.info, message: "\(requestName) success")
                             return
                         } catch {}
 
                         do {
                             let errorResponse = try decoder.decode(E.self, from: data)
                             completion(.failure(errorResponse))
-                            log(info: "\(requestName) error response")
+                            log(.info, message: "\(requestName) error response")
                             return
                         } catch {}
                     }
 
                     completion(.failure(nil))
-                    log(info: "\(requestName) parse error")
+                    log(.info, message: "\(requestName) parse error")
                 case .failure:
-                    log(info: "\(requestName) failure")
+                    log(.info, message: "\(requestName) failure")
                     completion(.failure(nil))
                 }
             }

diff --git a/IVPNClient/Managers/ConnectionManager.swift b/IVPNClient/Managers/ConnectionManager.swift
@@ -408,7 +408,7 @@ class ConnectionManager {
             return
         }
 
-        log(info: "Evaluating VPN connection for Network Protection")
+        log(.info, message: "Evaluating VPN connection for Network Protection")
 
         guard let networkTrust = Application.shared.network.trust else {
             return

diff --git a/IVPNClient/Managers/FileSystemManager.swift b/IVPNClient/Managers/FileSystemManager.swift
@@ -43,16 +43,16 @@ class FileSystemManager {
         do {
             try FileManager.default.removeItem(at: fileNameUrl)
         } catch {
-            log(error: "There was an error deleting file URL \(fileNameUrl). Error: \(error)")
+            log(.error, message: "There was an error deleting file URL \(fileNameUrl). Error: \(error)")
         }
     }
 
     static func loadDataFromResource(resourceName: String, resourceType: String, bundle: Bundle? = nil) -> Data? {
-        let bundle = bundle ?? Bundle.main        
+        let bundle = bundle ?? Bundle.main
         let resource = bundle.path(forResource: resourceName, ofType: resourceType)
 
         guard resource != nil else {
-            log(error: "Cannot read defaults file")
+            log(.error, message: "Cannot read defaults file")
             return nil
         }
 
@@ -63,14 +63,15 @@ class FileSystemManager {
         let data = try? Data(contentsOf: resource)
 
         guard data != nil else {
-            log(error: "Cannot initialize data from the resource file: \(resource)")
+            log(.error, message: "Cannot initialize data from the resource file: \(resource)")
             return nil
         }
 
         return data
     }
 
     static func clearSession() {
+        resetLogFile(name: Config.appLogFile)
         resetLogFile(name: Config.openVPNLogFile)
         resetLogFile(name: Config.wireGuardLogFile)
     }
@@ -83,7 +84,7 @@ class FileSystemManager {
         if !FileManager.default.fileExists(atPath: file) {
             FileManager.default.createFile(atPath: file, contents: nil, attributes: nil)
         } else {
-            log(error: "File is already created")
+            log(.error, message: "File is already created")
         }
     }
 
@@ -111,7 +112,7 @@ class FileSystemManager {
         do {
             try textToWrite.write(to: file, atomically: false, encoding: String.Encoding.utf8)
         } catch let error {
-            log(error: "Something went wrong: \(error)")
+            log(.error, message: "Something went wrong: \(error)")
         }
     }
 
@@ -120,7 +121,7 @@ class FileSystemManager {
             createSharedFile(name: name)
         }
 
-        writeToSharedFile(text: "\(Date.logTime()) \(UIDevice.logInfo())\n", name: name)
+        writeToSharedFile(text: "\(UIDevice.logInfo())\n", name: name)
     }
 
     static func updateLogFile(newestLog: String?, name: String, isLoggedIn: Bool) {
@@ -136,6 +137,10 @@ class FileSystemManager {
     }
 
     static func createLogFiles() {
+        if fileExists(name: Config.appLogFile) {
+            resetLogFile(name: Config.appLogFile)
+        }
+
         if fileExists(name: Config.openVPNLogFile) {
             resetLogFile(name: Config.openVPNLogFile)
         }

diff --git a/IVPNClient/Managers/IAPManager.swift b/IVPNClient/Managers/IAPManager.swift
@@ -54,13 +54,13 @@ class IAPManager {
             if !result.retrievedProducts.isEmpty {
                 self.products = Array(result.retrievedProducts)
                 completion(Array(result.retrievedProducts), nil)
-                log(info: "Products successfully fetched from App Store.")
+                log(.info, message: "Products successfully fetched from App Store.")
             } else if !result.invalidProductIDs.isEmpty {
                 completion(nil, "Invalid product identifier")
-                log(info: "Invalid App Store product identifier.")
+                log(.info, message: "Invalid App Store product identifier.")
             } else {
                 completion(nil, String(describing: result.error))
-                log(info: "There was an error with fetching products from App Store.")
+                log(.info, message: "There was an error with fetching products from App Store.")
             }
         }
     }
@@ -70,7 +70,7 @@ class IAPManager {
             switch result {
             case .success(let purchase):
                 completion(purchase, nil)
-                log(info: "Product was successfully purchased.")
+                log(.info, message: "Product was successfully purchased.")
             case .error(let error):
                 switch error.code {
                 case .unknown: completion(nil, "Unknown error. Please contact support")
@@ -84,7 +84,7 @@ class IAPManager {
                 case .cloudServiceRevoked: completion(nil, "User has revoked permission to use this cloud service")
                 default: completion(nil, (error as NSError).localizedDescription)
                 }
-                log(error: "There was an error with purchase.")
+                log(.error, message: "There was an error with purchase.")
             }
         }
     }
@@ -103,24 +103,24 @@ class IAPManager {
                 if let restoreError = results.restoreFailedPurchases.first {
                     let error = ErrorResult(status: 500, message: restoreError.0.localizedDescription)
                     completion(nil, error)
-                    log(error: restoreError.0.localizedDescription)
+                    log(.error, message: restoreError.0.localizedDescription)
                     return
                 }
 
                 let error = ErrorResult(status: 500, message: "Unknown error")
                 completion(nil, error)
-                log(error: "Unknown error")
+                log(.error, message: "Unknown error")
             } else if results.restoredPurchases.count > 0 {
                 var purchases = results.restoredPurchases
                 purchases.sort { $0.transaction.transactionDate! > $1.transaction.transactionDate! }
                 self.completeRestoredPurchase(purchase: purchases.first!) { account, error in
                     completion(account, error)
-                    log(info: "Purchases are restored.")
+                    log(.info, message: "Purchases are restored.")
                 }
             } else {
                 let error = ErrorResult(status: 500, message: "There are no purchases to restore.")
                 completion(nil, error)
-                log(error: "There are no purchases to restore.")
+                log(.error, message: "There are no purchases to restore.")
             }
         }
     }
@@ -138,18 +138,18 @@ class IAPManager {
                 }
                 Application.shared.serviceStatus = sessionStatus.serviceStatus
                 completion(sessionStatus.serviceStatus, nil)
-                log(info: "Purchase was successfully finished.")
+                log(.info, message: "Purchase was successfully finished.")
             case .failure(let error):
                 let defaultErrorResult = ErrorResult(status: 500, message: "Purchase was completed but service cannot be activated. Restart application to retry.")
                 completion(nil, error ?? defaultErrorResult)
-                log(error: "There was an error with purchase completion: \(error?.message ?? "")")
+                log(.error, message: "There was an error with purchase completion: \(error?.message ?? "")")
             }
         }
     }
 
     func completePurchases(products: [Purchase], endpoint: String, completion: @escaping (ServiceStatus?, ErrorResult?) -> Void) {
         if let product = products.last {
-            log(info: "Found incomplete purchase. Completing purchase...")
+            log(.info, message: "Found incomplete purchase. Completing purchase...")
 
             switch product.transaction.transactionState {
             case .purchased, .restored:
@@ -163,11 +163,11 @@ class IAPManager {
                             SwiftyStoreKit.finishTransaction(product.transaction)
                             Application.shared.serviceStatus = sessionStatus.serviceStatus
                             completion(sessionStatus.serviceStatus, nil)
-                            log(info: "Purchase was successfully finished.")
+                            log(.info, message: "Purchase was successfully finished.")
                         case .failure(let error):
                             let defaultErrorResult = ErrorResult(status: 500, message: "Purchase was completed but service cannot be activated. Restart application to retry.")
                             completion(nil, error ?? defaultErrorResult)
-                            log(error: "There was an error with purchase completion: \(error?.message ?? "")")
+                            log(.error, message: "There was an error with purchase completion: \(error?.message ?? "")")
                         }
                     }
                 }
@@ -191,11 +191,11 @@ class IAPManager {
                 }
                 KeyChain.username = account.accountId
                 completion(account, nil)
-                log(info: "Purchase was successfully finished.")
+                log(.info, message: "Purchase was successfully finished.")
             case .failure(let error):
                 let defaultErrorResult = ErrorResult(status: 500, message: "Purchase was restored but service cannot be activated. Restart application to retry.")
                 completion(nil, error ?? defaultErrorResult)
-                log(error: "There was an error with purchase completion: \(error?.message ?? "")")
+                log(.error, message: "There was an error with purchase completion: \(error?.message ?? "")")
             }
         }
     }

diff --git a/IVPNClient/Managers/NetworkManager.swift b/IVPNClient/Managers/NetworkManager.swift
@@ -60,7 +60,7 @@ class NetworkManager {
         do {
             try reachability.startNotifier()
         } catch {
-            log(info: "Unable to start reachability notifier")
+            log(.info, message: "Unable to start reachability notifier")
         }
 
         #warning("Remove network signal check after issue with VPN connections is resolved in Reachability.swift library")
-Original file line number
+Diff line change
@@ Expand Up / @@ -408,7 +408,7 @@ class ConnectionManager { @@
                 return
             }
-            log(info: "Evaluating VPN connection for Network Protection")
+            log(.info, message: "Evaluating VPN connection for Network Protection")
             guard let networkTrust = Application.shared.network.trust else {
                 return
@@ Expand Down @@