PIA-675: Added tvOS compatibility

pia-foss · Nov 7, 2023 · ed10005 · ed10005
1 parent 681c1d8
commit ed10005
Show file tree

Hide file tree

Showing 30 changed files with 62 additions and 50 deletions.
diff --git a/Sources/PIALibrary/Account/AccountProvider.swift b/Sources/PIALibrary/Account/AccountProvider.swift
@@ -23,9 +23,9 @@
 import Foundation
 
 /// Business interface related to user account.
-public protocol AccountProvider: class {
+public protocol AccountProvider: AnyObject {
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     /// The in-app products required to purchase a `Plan`.
     var planProducts: [Plan: InAppProduct]? { get }
     #endif
@@ -60,7 +60,7 @@ public protocol AccountProvider: class {
     /// The password reference object associated with the currentUser, or `nil` if logged out.
     var currentPasswordReference: Data? { get }
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     /// The last pending signup request (useful for recovery).
     var lastSignupRequest: SignupRequest? { get }
     #endif
@@ -172,7 +172,7 @@ public protocol AccountProvider: class {
      */
     func featureFlags(_ callback: SuccessLibraryCallback?)
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     /**
      Lists the available plans with their corresponding product to purchase in order to get them.
 

diff --git a/Sources/PIALibrary/Account/DefaultAccountProvider.swift b/Sources/PIALibrary/Account/DefaultAccountProvider.swift
@@ -40,7 +40,7 @@ class DefaultAccountProvider: AccountProvider, ConfigurationAccess, DatabaseAcce
 
     // MARK: AccountProvider
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     var planProducts: [Plan: InAppProduct]? {
         guard let products = accessedStore.availableProducts else {
             return nil
@@ -137,7 +137,7 @@ class DefaultAccountProvider: AccountProvider, ConfigurationAccess, DatabaseAcce
         return accessedDatabase.secure.passwordReference(for: username)
     }
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     var lastSignupRequest: SignupRequest? {
         guard let email = accessedDatabase.plain.lastSignupEmail else {
             return nil
@@ -356,7 +356,7 @@ class DefaultAccountProvider: AccountProvider, ConfigurationAccess, DatabaseAcce
         }
     }
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     func subscriptionInformation(_ callback: LibraryCallback<AppStoreInformation>?) {
         log.debug("Fetching available product keys...")
 

diff --git a/Sources/PIALibrary/Client+Configuration.swift b/Sources/PIALibrary/Client+Configuration.swift
@@ -158,7 +158,7 @@ extension Client {
         /// The default delay of VPN reconnection attempts.
         public var vpnReconnectionDelay: Int
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
 
         // MARK: InApp
 
@@ -250,7 +250,7 @@ extension Client {
             urlscfg.urlCache = nil
             sessionManager = Session(configuration: urlscfg)
 
-            #if os(iOS)
+            #if os(iOS) || os(tvOS)
             inAppPlans = [:]
             eligibleForTrial = true
             #endif
@@ -322,7 +322,7 @@ extension Client {
             return true
         }
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
 
         // MARK: InApp
 

diff --git a/Sources/PIALibrary/Client.swift b/Sources/PIALibrary/Client.swift
@@ -51,7 +51,7 @@ public final class Client {
 
     static var webServices: WebServices = PIAWebServices()
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     static var store: InAppProvider = AppStoreProvider()
     #endif
 
@@ -140,11 +140,4 @@ public final class Client {
     public static func ping(servers: [Server]) {
         ServersPinger.shared.ping(withDestinations: servers)
     }
-
-    /**
-     Returns the Signup Storyboard owned by the library to be used by the clients
-     */
-    public static func signupStoryboard() -> UIStoryboard {
-        UIStoryboard(name: "Signup", bundle: Bundle.module)
-    }
 }
diff --git a/Sources/PIALibrary/ClientAccess.swift b/Sources/PIALibrary/ClientAccess.swift
@@ -43,7 +43,7 @@ protocol WebServicesAccess {
 }
 
 protocol InAppAccess {
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     var accessedStore: InAppProvider { get }
     #endif
 }
@@ -79,7 +79,7 @@ extension WebServicesAccess {
 }
 
 extension InAppAccess {
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     var accessedStore: InAppProvider {
         return Client.store
     }

diff --git a/Sources/PIALibrary/ClientError.swift b/Sources/PIALibrary/ClientError.swift
@@ -55,7 +55,7 @@ public enum ClientError: Error, Equatable {
     /// Error while checking the dip token renewal.
     case dipTokenRenewalError
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     /// No in-app history receipt is available.
     case noReceipt
 

diff --git a/Sources/PIALibrary/Mock/Client+Mock.swift b/Sources/PIALibrary/Mock/Client+Mock.swift
@@ -60,7 +60,7 @@ extension Client {
         providers.tileProvider = provider
     }
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     /**
      Uses a mock in-app provider for testing purchases.
      */

diff --git a/Sources/PIALibrary/Mock/MockAccountProvider.swift b/Sources/PIALibrary/Mock/MockAccountProvider.swift
@@ -143,7 +143,7 @@ public class MockAccountProvider: AccountProvider, WebServicesConsumer {
 
     // MARK: AccountProvider
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     /// :nodoc:
     public var planProducts: [Plan : InAppProduct]? {
         return delegate.planProducts
@@ -198,7 +198,7 @@ public class MockAccountProvider: AccountProvider, WebServicesConsumer {
         }
     }
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     /// :nodoc:
     public var lastSignupRequest: SignupRequest? {
         return delegate.lastSignupRequest
@@ -276,7 +276,7 @@ public class MockAccountProvider: AccountProvider, WebServicesConsumer {
         delegate.cleanDatabase()
     }
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
     /// :nodoc:
     public func listPlanProducts(_ callback: (([Plan : InAppProduct]?, Error?) -> Void)?) {
         delegate.listPlanProducts(callback)

diff --git a/Sources/PIALibrary/Mock/MockInAppProvider.swift b/Sources/PIALibrary/Mock/MockInAppProvider.swift
@@ -22,7 +22,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 private class MockProduct: InAppProduct {
     let identifier: String
 

diff --git a/Sources/PIALibrary/Notification+Core.swift b/Sources/PIALibrary/Notification+Core.swift
@@ -60,7 +60,7 @@ extension Notification.Name {
 
     public static let PIAVPNDidFail = Notification.Name("PIAVPNDidFail")
 
-    #if os(iOS)
+    #if os(iOS) || os(tvOS)
 
     // MARK: InApp
 

diff --git a/Sources/PIALibrary/Providers/PIACSIDeviceInformationProvider.swift b/Sources/PIALibrary/Providers/PIACSIDeviceInformationProvider.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import PIACSI
+import csi
 import UIKit
 
 class PIACSIDeviceInformationProvider: ICSIProvider {

diff --git a/Sources/PIALibrary/Providers/PIACSILastKnownExceptionProvider.swift b/Sources/PIALibrary/Providers/PIACSILastKnownExceptionProvider.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import PIACSI
+import csi
 
 class PIACSILastKnownExceptionProvider: ICSIProvider {
 

diff --git a/Sources/PIALibrary/Providers/PIACSIUserInformationProvider.swift b/Sources/PIALibrary/Providers/PIACSIUserInformationProvider.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import PIACSI
+import csi
 
 class PIACSIUserInformationProvider: ICSIProvider {
 

diff --git a/Sources/PIALibrary/Providers/PIACrashlabClientStateProvider.swift b/Sources/PIALibrary/Providers/PIACrashlabClientStateProvider.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import PIACSI
+import csi
 
 class PIACSIClientStateProvider : IEndPointProvider {
 

diff --git a/Sources/PIALibrary/Providers/PIACrashlabProtocolInformationProvider.swift b/Sources/PIALibrary/Providers/PIACrashlabProtocolInformationProvider.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import PIACSI
+import csi
 
 class PIACSIProtocolInformationProvider : ICSIProvider {
 

diff --git a/Sources/PIALibrary/Providers/PIACrashlabRegionInformationProvider.swift b/Sources/PIALibrary/Providers/PIACrashlabRegionInformationProvider.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import PIACSI
+import csi
 
 class PIACSIRegionInformationProvider : ICSIProvider {
 

diff --git a/Sources/PIALibrary/Providers/PIAKPIClientStateProvider.swift b/Sources/PIALibrary/Providers/PIAKPIClientStateProvider.swift
@@ -20,7 +20,7 @@
 //
 
 import Foundation
-import PIAKPI
+import kpi
 
 class PIAKPIClientStateProvider : KPIClientStateProvider {
 

diff --git a/Sources/PIALibrary/Providers/PIAKPIStagingClientStateProvider.swift b/Sources/PIALibrary/Providers/PIAKPIStagingClientStateProvider.swift
@@ -20,7 +20,7 @@
 //
 
 import Foundation
-import PIAKPI
+import kpi
 
 class PIAKPIStagingClientStateProvider : KPIClientStateProvider {
 

diff --git a/Sources/PIALibrary/Providers/PIARegionClientStateProvider.swift b/Sources/PIALibrary/Providers/PIARegionClientStateProvider.swift
@@ -20,7 +20,7 @@
 //
 
 import Foundation
-import PIARegions
+import regions
 
 class PIARegionClientStateProvider : IRegionEndpointProvider {
 

diff --git a/Sources/PIALibrary/ServiceQuality/ServiceQualityManager.swift b/Sources/PIALibrary/ServiceQuality/ServiceQualityManager.swift
@@ -21,7 +21,7 @@
 
 import Foundation
 import UIKit
-import PIAKPI
+import kpi
 import SwiftyBeaver
 
 private let log = SwiftyBeaver.self
@@ -227,8 +227,10 @@ public class ServiceQualityManager: NSObject {
         switch Client.providers.vpnProvider.currentVPNType {
         case IKEv2Profile.vpnType:
             return KPIVpnProtocol.ipsec
+        #if(iOS)
         case PIATunnelProfile.vpnType:
             return KPIVpnProtocol.ovpn
+        #endif
         case PIAWGTunnelProfile.vpnType:
             return KPIVpnProtocol.wireguard
         default:

diff --git a/Sources/PIALibrary/VPN/IKEv2EncryptionAlgorithm.swift b/Sources/PIALibrary/VPN/IKEv2EncryptionAlgorithm.swift
@@ -43,18 +43,25 @@ public enum IKEv2EncryptionAlgorithm: String, EnumsBuilder {
     public func networkExtensionValue() -> NEVPNIKEv2EncryptionAlgorithm {
         switch self {
             case .algorithmAES128: return NEVPNIKEv2EncryptionAlgorithm.algorithmAES128
-            case .algorithmAES256: return NEVPNIKEv2EncryptionAlgorithm.algorithmAES256
             case .algorithmAES128GCM: return NEVPNIKEv2EncryptionAlgorithm.algorithmAES128GCM
+            case .algorithmAES256: return NEVPNIKEv2EncryptionAlgorithm.algorithmAES256
             case .algorithmAES256GCM: return NEVPNIKEv2EncryptionAlgorithm.algorithmAES256GCM
         }
     }
 
     public func integrityAlgorithms() -> [IKEv2IntegrityAlgorithm] {
             switch self {
+            #if os(iOS)
             case .algorithmAES128: return [.SHA96, .SHA256, .SHA384, .SHA512]
             case .algorithmAES256: return [.SHA96, .SHA256, .SHA384, .SHA512]
             case .algorithmAES128GCM: return [.SHA96, .SHA160, .SHA256]
             case .algorithmAES256GCM: return [.SHA96, .SHA160, .SHA256]
+            #elseif os(tvOS)
+            case .algorithmAES128: return [.SHA256, .SHA384, .SHA512]
+            case .algorithmAES256: return [.SHA256, .SHA384, .SHA512]
+            case .algorithmAES128GCM: return [.SHA256]
+            case .algorithmAES256GCM: return [.SHA256]
+            #endif
         }
     }
 

diff --git a/Sources/PIALibrary/VPN/IKEv2IntegrityAlgorithm.swift b/Sources/PIALibrary/VPN/IKEv2IntegrityAlgorithm.swift
@@ -26,9 +26,10 @@ import NetworkExtension
 public enum IKEv2IntegrityAlgorithm: String, EnumsBuilder {
 
     public static let defaultIntegrity: IKEv2IntegrityAlgorithm = .SHA256
-
+    #if os(iOS)
     case SHA96 = "SHA96"
     case SHA160 = "SHA160"
+    #endif
     case SHA256 = "SHA256"
     case SHA384 = "SHA384"
     case SHA512 = "SHA512"
@@ -43,12 +44,13 @@ public enum IKEv2IntegrityAlgorithm: String, EnumsBuilder {
 
     public func networkExtensionValue() -> NEVPNIKEv2IntegrityAlgorithm {
         switch self {
+        #if os(iOS)
             case .SHA96: return NEVPNIKEv2IntegrityAlgorithm.SHA96
             case .SHA160: return NEVPNIKEv2IntegrityAlgorithm.SHA160
+        #endif
             case .SHA256: return NEVPNIKEv2IntegrityAlgorithm.SHA256
             case .SHA384: return NEVPNIKEv2IntegrityAlgorithm.SHA384
             case .SHA512: return NEVPNIKEv2IntegrityAlgorithm.SHA512
-            default: return NEVPNIKEv2IntegrityAlgorithm.SHA96
         }
     }
 

diff --git a/Sources/PIALibrary/VPN/NetworkExtensionProfile.swift b/Sources/PIALibrary/VPN/NetworkExtensionProfile.swift
@@ -91,7 +91,7 @@ extension NetworkExtensionProfile {
                 self.configureDefaultOnDemandRules(force, vpn, configuration)
             }
         }
-
+        #if os(iOS)
         if #available(iOS 14.2, *) {
             let selectedProtocol = Client.preferences.vpnType
             let isWireGuard = selectedProtocol == PIAWGTunnelProfile.vpnType
@@ -112,6 +112,7 @@ extension NetworkExtensionProfile {
                 }
             }
         }
+        #endif
 
         log.debug("Configured with server: \(protocolConfiguration.serverAddress!)")
         log.debug("Username: \(protocolConfiguration.username!)")
@@ -209,6 +210,7 @@ extension NetworkExtensionProfile {
     }
 
     private func configureOnDemandOnCellularNetworks(_ vpn: NEVPNManager) {
+        #if os(iOS)
         let rules = Client.preferences.nmtGenericRules
         let cellularRule = rules[NMTType.cellular.rawValue]
 
@@ -226,6 +228,7 @@ extension NetworkExtensionProfile {
             ruleIgnore.interfaceTypeMatch = .cellular
             vpn.onDemandRules?.append(ruleIgnore)
         }
+        #endif
     }
 
     private func configureDefaultOnDemandRules(_ force: Bool,

diff --git a/Sources/PIALibrary/VPN/PIATunnelProfile.swift b/Sources/PIALibrary/VPN/PIATunnelProfile.swift
@@ -19,7 +19,7 @@
 //  You should have received a copy of the GNU General Public License along with the Private
 //  Internet Access iOS Client.  If not, see <https://www.gnu.org/licenses/>.
 //
-
+#if os(iOS)
 import Foundation
 import TunnelKitOpenVPN
 import NetworkExtension
@@ -346,3 +346,4 @@ public class PIATunnelProfile: NetworkExtensionProfile {
         return lines.joined(separator: "\n")
     }
 }
+#endif