diff --git a/ios/Settings/DNSSettings.swift b/ios/MullvadSettings/DNSSettings.swift similarity index 100% rename from ios/Settings/DNSSettings.swift rename to ios/MullvadSettings/DNSSettings.swift diff --git a/ios/Settings/DeviceState.swift b/ios/MullvadSettings/DeviceState.swift similarity index 100% rename from ios/Settings/DeviceState.swift rename to ios/MullvadSettings/DeviceState.swift diff --git a/ios/Settings/KeychainSettingsStore.swift b/ios/MullvadSettings/KeychainSettingsStore.swift similarity index 100% rename from ios/Settings/KeychainSettingsStore.swift rename to ios/MullvadSettings/KeychainSettingsStore.swift diff --git a/ios/Settings/Migration.swift b/ios/MullvadSettings/Migration.swift similarity index 100% rename from ios/Settings/Migration.swift rename to ios/MullvadSettings/Migration.swift diff --git a/ios/Settings/MigrationManager.swift b/ios/MullvadSettings/MigrationManager.swift similarity index 100% rename from ios/Settings/MigrationManager.swift rename to ios/MullvadSettings/MigrationManager.swift diff --git a/ios/Settings/Settings.h b/ios/MullvadSettings/MullvadSettings.h similarity index 100% rename from ios/Settings/Settings.h rename to ios/MullvadSettings/MullvadSettings.h diff --git a/ios/Settings/SettingsManager.swift b/ios/MullvadSettings/SettingsManager.swift similarity index 100% rename from ios/Settings/SettingsManager.swift rename to ios/MullvadSettings/SettingsManager.swift diff --git a/ios/Settings/SettingsParser.swift b/ios/MullvadSettings/SettingsParser.swift similarity index 100% rename from ios/Settings/SettingsParser.swift rename to ios/MullvadSettings/SettingsParser.swift diff --git a/ios/Settings/SettingsStore.swift b/ios/MullvadSettings/SettingsStore.swift similarity index 100% rename from ios/Settings/SettingsStore.swift rename to ios/MullvadSettings/SettingsStore.swift diff --git a/ios/Settings/StoredAccountData.swift b/ios/MullvadSettings/StoredAccountData.swift similarity index 100% rename from ios/Settings/StoredAccountData.swift rename to ios/MullvadSettings/StoredAccountData.swift diff --git a/ios/Settings/StoredDeviceData.swift b/ios/MullvadSettings/StoredDeviceData.swift similarity index 100% rename from ios/Settings/StoredDeviceData.swift rename to ios/MullvadSettings/StoredDeviceData.swift diff --git a/ios/Settings/TunnelSettings.swift b/ios/MullvadSettings/TunnelSettings.swift similarity index 100% rename from ios/Settings/TunnelSettings.swift rename to ios/MullvadSettings/TunnelSettings.swift diff --git a/ios/Settings/TunnelSettingsV1.swift b/ios/MullvadSettings/TunnelSettingsV1.swift similarity index 100% rename from ios/Settings/TunnelSettingsV1.swift rename to ios/MullvadSettings/TunnelSettingsV1.swift diff --git a/ios/Settings/TunnelSettingsV2.swift b/ios/MullvadSettings/TunnelSettingsV2.swift similarity index 100% rename from ios/Settings/TunnelSettingsV2.swift rename to ios/MullvadSettings/TunnelSettingsV2.swift diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 3b3c0aaebf43..77995bebf67e 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -216,9 +216,9 @@ 58B26E262943522400D5980C /* NotificationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58B26E252943522400D5980C /* NotificationProvider.swift */; }; 58B26E282943527300D5980C /* SystemNotificationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58B26E272943527300D5980C /* SystemNotificationProvider.swift */; }; 58B26E2A2943545A00D5980C /* NotificationManagerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58B26E292943545A00D5980C /* NotificationManagerDelegate.swift */; }; - 58B2FDD62AA71D2A003EB5C6 /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = 58B2FDD52AA71D2A003EB5C6 /* Settings.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 58B2FDD92AA71D2A003EB5C6 /* Settings.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58B2FDD32AA71D2A003EB5C6 /* Settings.framework */; }; - 58B2FDDA2AA71D2A003EB5C6 /* Settings.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 58B2FDD32AA71D2A003EB5C6 /* Settings.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 58B2FDD62AA71D2A003EB5C6 /* MullvadSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 58B2FDD52AA71D2A003EB5C6 /* MullvadSettings.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 58B2FDD92AA71D2A003EB5C6 /* MullvadSettings.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58B2FDD32AA71D2A003EB5C6 /* MullvadSettings.framework */; }; + 58B2FDDA2AA71D2A003EB5C6 /* MullvadSettings.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 58B2FDD32AA71D2A003EB5C6 /* MullvadSettings.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 58B2FDDE2AA71D5C003EB5C6 /* Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 068CE5732927B7A400A068BB /* Migration.swift */; }; 58B2FDDF2AA71D5C003EB5C6 /* DNSSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 580F8B8528197958002E0998 /* DNSSettings.swift */; }; 58B2FDE02AA71D5C003EB5C6 /* TunnelSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A92ECC202A77FFAF0052F1B1 /* TunnelSettings.swift */; }; @@ -391,7 +391,7 @@ 58FE25C22AA72729003D1918 /* MullvadREST.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06799ABC28F98E1D00ACD94E /* MullvadREST.framework */; }; 58FE25C62AA72779003D1918 /* PacketTunnelCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C7A4362A863F440060C66F /* PacketTunnelCore.framework */; }; 58FE25CB2AA727A9003D1918 /* libRelaySelector.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5898D29829017DAC00EB5EBA /* libRelaySelector.a */; }; - 58FE25CE2AA72802003D1918 /* Settings.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58B2FDD32AA71D2A003EB5C6 /* Settings.framework */; }; + 58FE25CE2AA72802003D1918 /* MullvadSettings.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58B2FDD32AA71D2A003EB5C6 /* MullvadSettings.framework */; }; 58FEEB58260B662E00A621A8 /* AutomaticKeyboardResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FEEB57260B662E00A621A8 /* AutomaticKeyboardResponder.swift */; }; 7A02D4EB2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 7A02D4EA2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan */; }; 7A09C98129D99215000C2CAC /* String+FuzzyMatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */; }; @@ -902,7 +902,7 @@ files = ( 58D223E7294C8F120029F5F8 /* MullvadTypes.framework in Embed Frameworks */, 58D223FA294C8FF10029F5F8 /* MullvadLogging.framework in Embed Frameworks */, - 58B2FDDA2AA71D2A003EB5C6 /* Settings.framework in Embed Frameworks */, + 58B2FDDA2AA71D2A003EB5C6 /* MullvadSettings.framework in Embed Frameworks */, A9EC20F02A5D79ED0040D56E /* TunnelObfuscation.framework in Embed Frameworks */, 7ABCA5B42A9349F20044A708 /* Routing.framework in Embed Frameworks */, 06799AD228F98E1D00ACD94E /* MullvadREST.framework in Embed Frameworks */, @@ -1272,8 +1272,8 @@ 58B26E252943522400D5980C /* NotificationProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationProvider.swift; sourceTree = "<group>"; }; 58B26E272943527300D5980C /* SystemNotificationProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemNotificationProvider.swift; sourceTree = "<group>"; }; 58B26E292943545A00D5980C /* NotificationManagerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManagerDelegate.swift; sourceTree = "<group>"; }; - 58B2FDD32AA71D2A003EB5C6 /* Settings.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Settings.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 58B2FDD52AA71D2A003EB5C6 /* Settings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; }; + 58B2FDD32AA71D2A003EB5C6 /* MullvadSettings.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MullvadSettings.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 58B2FDD52AA71D2A003EB5C6 /* MullvadSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MullvadSettings.h; sourceTree = "<group>"; }; 58B43C1825F77DB60002C8C3 /* TunnelControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelControlView.swift; sourceTree = "<group>"; }; 58B4656F2A98C53300467203 /* RequestExecutorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestExecutorTests.swift; sourceTree = "<group>"; }; 58B93A1226C3F13600A55733 /* TunnelState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelState.swift; sourceTree = "<group>"; }; @@ -1591,7 +1591,7 @@ 06799AD128F98E1D00ACD94E /* MullvadREST.framework in Frameworks */, 063F02792902B63F001FA09F /* RelayCache.framework in Frameworks */, A97F1F472A1F4E1A00ECEFDE /* MullvadTransport.framework in Frameworks */, - 58B2FDD92AA71D2A003EB5C6 /* Settings.framework in Frameworks */, + 58B2FDD92AA71D2A003EB5C6 /* MullvadSettings.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1601,7 +1601,7 @@ files = ( 589C6A7D2A45B06800DAD3EF /* TunnelObfuscation.framework in Frameworks */, 58FE25C62AA72779003D1918 /* PacketTunnelCore.framework in Frameworks */, - 58FE25CE2AA72802003D1918 /* Settings.framework in Frameworks */, + 58FE25CE2AA72802003D1918 /* MullvadSettings.framework in Frameworks */, A9D99BA92A1F81B700DE27D3 /* MullvadTransport.framework in Frameworks */, 5898D2AB2901845400EB5EBA /* libRelaySelector.a in Frameworks */, 5898D2AC2901845400EB5EBA /* libTunnelProviderMessaging.a in Frameworks */, @@ -2315,10 +2315,10 @@ path = UI; sourceTree = "<group>"; }; - 58B2FDD42AA71D2A003EB5C6 /* Settings */ = { + 58B2FDD42AA71D2A003EB5C6 /* MullvadSettings */ = { isa = PBXGroup; children = ( - 58B2FDD52AA71D2A003EB5C6 /* Settings.h */, + 58B2FDD52AA71D2A003EB5C6 /* MullvadSettings.h */, 580F8B8528197958002E0998 /* DNSSettings.swift */, 06410DFD292CE18F00AFC18C /* KeychainSettingsStore.swift */, 068CE5732927B7A400A068BB /* Migration.swift */, @@ -2333,7 +2333,7 @@ A92ECC2B2A7803A50052F1B1 /* DeviceState.swift */, A9D96B192A8247C100A5C673 /* MigrationManager.swift */, ); - path = Settings; + path = MullvadSettings; sourceTree = "<group>"; }; 58BDEB9E2A98F6B400F578F2 /* Mocks */ = { @@ -2427,6 +2427,7 @@ 581943F228F8014500B0CB5E /* MullvadTypes */, 06799ABD28F98E1D00ACD94E /* MullvadREST */, 58FBFBE7291622580020E046 /* MullvadRESTTests */, + 58B2FDD42AA71D2A003EB5C6 /* MullvadSettings */, 063F02742902B63F001FA09F /* RelayCache */, 5898D29929017DAC00EB5EBA /* RelaySelector */, 58D223A6294C8A490029F5F8 /* Operations */, @@ -2441,7 +2442,6 @@ 58C7A4432A863F490060C66F /* PacketTunnelCoreTests */, 7A88DCCF2A8FABBE00D2FF0E /* Routing */, 7A88DCDD2A8FABBE00D2FF0E /* RoutingTests */, - 58B2FDD42AA71D2A003EB5C6 /* Settings */, 58CE5E61224146200008646E /* Products */, 584F991F2902CBDD001F858D /* Frameworks */, ); @@ -2470,7 +2470,7 @@ 58C7A43D2A863F460060C66F /* PacketTunnelCoreTests.xctest */, 7A88DCCE2A8FABBE00D2FF0E /* Routing.framework */, 7A88DCD72A8FABBE00D2FF0E /* RoutingTests.xctest */, - 58B2FDD32AA71D2A003EB5C6 /* Settings.framework */, + 58B2FDD32AA71D2A003EB5C6 /* MullvadSettings.framework */, ); name = Products; sourceTree = "<group>"; @@ -2797,7 +2797,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 58B2FDD62AA71D2A003EB5C6 /* Settings.h in Headers */, + 58B2FDD62AA71D2A003EB5C6 /* MullvadSettings.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3036,9 +3036,9 @@ productReference = 58B0A2A0238EE67E00BC001D /* MullvadVPNTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 58B2FDD22AA71D2A003EB5C6 /* Settings */ = { + 58B2FDD22AA71D2A003EB5C6 /* MullvadSettings */ = { isa = PBXNativeTarget; - buildConfigurationList = 58B2FDDD2AA71D2B003EB5C6 /* Build configuration list for PBXNativeTarget "Settings" */; + buildConfigurationList = 58B2FDDD2AA71D2B003EB5C6 /* Build configuration list for PBXNativeTarget "MullvadSettings" */; buildPhases = ( 58B2FDCE2AA71D2A003EB5C6 /* Headers */, 58B2FDCF2AA71D2A003EB5C6 /* Sources */, @@ -3050,12 +3050,12 @@ 58FE25BE2AA72188003D1918 /* PBXTargetDependency */, 58FE25C52AA72729003D1918 /* PBXTargetDependency */, ); - name = Settings; + name = MullvadSettings; packageProductDependencies = ( 58B2FDEA2AA72049003EB5C6 /* WireGuardKitTypes */, ); productName = Settings; - productReference = 58B2FDD32AA71D2A003EB5C6 /* Settings.framework */; + productReference = 58B2FDD32AA71D2A003EB5C6 /* MullvadSettings.framework */; productType = "com.apple.product-type.framework"; }; 58C7A4352A863F440060C66F /* PacketTunnelCore */ = { @@ -3464,7 +3464,7 @@ 58695A9C2A4ADA9100328DB3 /* TunnelObfuscationTests */, 58C7A4352A863F440060C66F /* PacketTunnelCore */, 58C7A43C2A863F450060C66F /* PacketTunnelCoreTests */, - 58B2FDD22AA71D2A003EB5C6 /* Settings */, + 58B2FDD22AA71D2A003EB5C6 /* MullvadSettings */, 7A88DCCD2A8FABBE00D2FF0E /* Routing */, 7A88DCD62A8FABBE00D2FF0E /* RoutingTests */, ); @@ -4328,7 +4328,7 @@ }; 58B2FDD82AA71D2A003EB5C6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 58B2FDD22AA71D2A003EB5C6 /* Settings */; + target = 58B2FDD22AA71D2A003EB5C6 /* MullvadSettings */; targetProxy = 58B2FDD72AA71D2A003EB5C6 /* PBXContainerItemProxy */; }; 58C7A4402A863F470060C66F /* PBXTargetDependency */ = { @@ -4481,7 +4481,7 @@ }; 58FE25D12AA72802003D1918 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 58B2FDD22AA71D2A003EB5C6 /* Settings */; + target = 58B2FDD22AA71D2A003EB5C6 /* MullvadSettings */; targetProxy = 58FE25D02AA72802003D1918 /* PBXContainerItemProxy */; }; 7A88DCDA2A8FABBE00D2FF0E /* PBXTargetDependency */ = { @@ -4717,7 +4717,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 4; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; + ENABLE_MODULE_VERIFIER = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = TunnelObfuscation/Info.plist; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Mullvad VPN AB. All rights reserved."; @@ -4758,7 +4758,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 4; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; + ENABLE_MODULE_VERIFIER = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = TunnelObfuscation/Info.plist; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Mullvad VPN AB. All rights reserved."; @@ -5803,7 +5803,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; + ENABLE_MODULE_VERIFIER = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Mullvad VPN AB. All rights reserved."; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = MullvadTransport/Info.plist; @@ -5850,7 +5850,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; + ENABLE_MODULE_VERIFIER = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Mullvad VPN AB. All rights reserved."; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = MullvadTransport/Info.plist; @@ -5957,7 +5957,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 58B2FDDD2AA71D2B003EB5C6 /* Build configuration list for PBXNativeTarget "Settings" */ = { + 58B2FDDD2AA71D2B003EB5C6 /* Build configuration list for PBXNativeTarget "MullvadSettings" */ = { isa = XCConfigurationList; buildConfigurations = ( 58B2FDDB2AA71D2B003EB5C6 /* Debug */, diff --git a/ios/MullvadVPN/AppDelegate.swift b/ios/MullvadVPN/AppDelegate.swift index 34a8f6463cec..5bd73b1d52b4 100644 --- a/ios/MullvadVPN/AppDelegate.swift +++ b/ios/MullvadVPN/AppDelegate.swift @@ -9,11 +9,11 @@ import BackgroundTasks import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTransport import MullvadTypes import Operations import RelayCache -import Settings import StoreKit import UIKit import UserNotifications diff --git a/ios/MullvadVPN/Containers/Root/RootConfiguration.swift b/ios/MullvadVPN/Containers/Root/RootConfiguration.swift index a3a2de79a90b..bfcdf1c6e7d0 100644 --- a/ios/MullvadVPN/Containers/Root/RootConfiguration.swift +++ b/ios/MullvadVPN/Containers/Root/RootConfiguration.swift @@ -7,7 +7,7 @@ // import Foundation -import Settings +import MullvadSettings struct RootDeviceInfoViewModel { let configuration: RootConfiguration diff --git a/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift b/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift index 31a3024f7f61..94ae7ef1dc73 100644 --- a/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift +++ b/ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift @@ -8,10 +8,10 @@ import Combine import MullvadREST +import MullvadSettings import MullvadTypes import RelayCache import Routing -import Settings import UIKit /** diff --git a/ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift b/ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift index 31bcb86b1165..4412fd5b3a87 100644 --- a/ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift +++ b/ios/MullvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift @@ -7,8 +7,8 @@ // import Foundation +import MullvadSettings import MullvadTypes -import Settings final class AccountExpiryInAppNotificationProvider: NotificationProvider, InAppNotificationProvider { private var accountExpiry: Date? diff --git a/ios/MullvadVPN/Notifications/Notification Providers/AccountExpirySystemNotificationProvider.swift b/ios/MullvadVPN/Notifications/Notification Providers/AccountExpirySystemNotificationProvider.swift index a608b72cdd44..98c2cb549d69 100644 --- a/ios/MullvadVPN/Notifications/Notification Providers/AccountExpirySystemNotificationProvider.swift +++ b/ios/MullvadVPN/Notifications/Notification Providers/AccountExpirySystemNotificationProvider.swift @@ -7,7 +7,7 @@ // import Foundation -import Settings +import MullvadSettings import UserNotifications final class AccountExpirySystemNotificationProvider: NotificationProvider, SystemNotificationProvider { diff --git a/ios/MullvadVPN/Notifications/Notification Providers/RegisteredDeviceInAppNotificationProvider.swift b/ios/MullvadVPN/Notifications/Notification Providers/RegisteredDeviceInAppNotificationProvider.swift index b9d23646cfd6..8ac30f74f716 100644 --- a/ios/MullvadVPN/Notifications/Notification Providers/RegisteredDeviceInAppNotificationProvider.swift +++ b/ios/MullvadVPN/Notifications/Notification Providers/RegisteredDeviceInAppNotificationProvider.swift @@ -7,7 +7,7 @@ // import Foundation -import Settings +import MullvadSettings import UIKit.UIColor import UIKit.UIFont diff --git a/ios/MullvadVPN/SceneDelegate.swift b/ios/MullvadVPN/SceneDelegate.swift index 51cdef1e943d..7a7f9f84da40 100644 --- a/ios/MullvadVPN/SceneDelegate.swift +++ b/ios/MullvadVPN/SceneDelegate.swift @@ -8,10 +8,10 @@ import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations import RelayCache -import Settings import UIKit class SceneDelegate: UIResponder, UIWindowSceneDelegate, SettingsMigrationUIHandler { diff --git a/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift b/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift index 14abadd401df..12c6e5a01776 100644 --- a/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift +++ b/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift @@ -11,12 +11,12 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTransport import MullvadTypes import enum NetworkExtension.NEProviderStopReason import RelayCache import RelaySelector -import Settings import TunnelProviderMessaging final class SimulatorTunnelProviderHost: SimulatorTunnelProviderDelegate { diff --git a/ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift b/ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift index 0380e7d4e02d..74881d49694d 100644 --- a/ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift +++ b/ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift @@ -8,9 +8,9 @@ import Foundation import MullvadLogging +import MullvadSettings import MullvadTypes import Operations -import Settings class LoadTunnelConfigurationOperation: ResultOperation<Void> { private let logger = Logger(label: "LoadTunnelConfigurationOperation") diff --git a/ios/MullvadVPN/TunnelManager/RedeemVoucherOperation.swift b/ios/MullvadVPN/TunnelManager/RedeemVoucherOperation.swift index a184f6c8c017..7fab35b2e4be 100644 --- a/ios/MullvadVPN/TunnelManager/RedeemVoucherOperation.swift +++ b/ios/MullvadVPN/TunnelManager/RedeemVoucherOperation.swift @@ -9,9 +9,9 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings class RedeemVoucherOperation: ResultOperation<REST.SubmitVoucherResponse> { private let logger = Logger(label: "RedeemVoucherOperation") diff --git a/ios/MullvadVPN/TunnelManager/RotateKeyOperation.swift b/ios/MullvadVPN/TunnelManager/RotateKeyOperation.swift index e3344d9afa9c..b40968d380c5 100644 --- a/ios/MullvadVPN/TunnelManager/RotateKeyOperation.swift +++ b/ios/MullvadVPN/TunnelManager/RotateKeyOperation.swift @@ -9,9 +9,9 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings import class WireGuardKitTypes.PrivateKey class RotateKeyOperation: ResultOperation<Void> { diff --git a/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift b/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift index 72a673468a65..ee805c9d92c9 100644 --- a/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift +++ b/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift @@ -9,9 +9,9 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings import class WireGuardKitTypes.PrivateKey import class WireGuardKitTypes.PublicKey diff --git a/ios/MullvadVPN/TunnelManager/TunnelBlockObserver.swift b/ios/MullvadVPN/TunnelManager/TunnelBlockObserver.swift index ba928ee40c7c..050fb1fdf26c 100644 --- a/ios/MullvadVPN/TunnelManager/TunnelBlockObserver.swift +++ b/ios/MullvadVPN/TunnelManager/TunnelBlockObserver.swift @@ -7,7 +7,7 @@ // import Foundation -import Settings +import MullvadSettings final class TunnelBlockObserver: TunnelObserver { typealias DidLoadConfigurationHandler = (TunnelManager) -> Void diff --git a/ios/MullvadVPN/TunnelManager/TunnelInteractor.swift b/ios/MullvadVPN/TunnelManager/TunnelInteractor.swift index b7cbef5be441..d5f9d9ae8bce 100644 --- a/ios/MullvadVPN/TunnelManager/TunnelInteractor.swift +++ b/ios/MullvadVPN/TunnelManager/TunnelInteractor.swift @@ -7,9 +7,9 @@ // import Foundation +import MullvadSettings import RelayCache import RelaySelector -import Settings protocol TunnelInteractor { // MARK: - Tunnel manipulation diff --git a/ios/MullvadVPN/TunnelManager/TunnelManager.swift b/ios/MullvadVPN/TunnelManager/TunnelManager.swift index 9facc14552c9..3207834035a1 100644 --- a/ios/MullvadVPN/TunnelManager/TunnelManager.swift +++ b/ios/MullvadVPN/TunnelManager/TunnelManager.swift @@ -9,12 +9,12 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import NetworkExtension import Operations import RelayCache import RelaySelector -import Settings import StoreKit import TunnelProviderMessaging import UIKit diff --git a/ios/MullvadVPN/TunnelManager/TunnelObserver.swift b/ios/MullvadVPN/TunnelManager/TunnelObserver.swift index bd930d56fd8e..0ae9fd5f636d 100644 --- a/ios/MullvadVPN/TunnelManager/TunnelObserver.swift +++ b/ios/MullvadVPN/TunnelManager/TunnelObserver.swift @@ -7,7 +7,7 @@ // import Foundation -import Settings +import MullvadSettings protocol TunnelObserver: AnyObject { func tunnelManagerDidLoadConfiguration(_ manager: TunnelManager) diff --git a/ios/MullvadVPN/TunnelManager/UpdateAccountDataOperation.swift b/ios/MullvadVPN/TunnelManager/UpdateAccountDataOperation.swift index be6d3742d88b..2b880ab1c915 100644 --- a/ios/MullvadVPN/TunnelManager/UpdateAccountDataOperation.swift +++ b/ios/MullvadVPN/TunnelManager/UpdateAccountDataOperation.swift @@ -9,9 +9,9 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings class UpdateAccountDataOperation: ResultOperation<Void> { private let logger = Logger(label: "UpdateAccountDataOperation") diff --git a/ios/MullvadVPN/TunnelManager/UpdateDeviceDataOperation.swift b/ios/MullvadVPN/TunnelManager/UpdateDeviceDataOperation.swift index ceefe4bcc774..85700d8dca01 100644 --- a/ios/MullvadVPN/TunnelManager/UpdateDeviceDataOperation.swift +++ b/ios/MullvadVPN/TunnelManager/UpdateDeviceDataOperation.swift @@ -9,9 +9,9 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings import class WireGuardKitTypes.PublicKey class UpdateDeviceDataOperation: ResultOperation<StoredDeviceData> { diff --git a/ios/MullvadVPN/TunnelManager/WgKeyRotation.swift b/ios/MullvadVPN/TunnelManager/WgKeyRotation.swift index b1dac73cb4fd..89e6ae68916b 100644 --- a/ios/MullvadVPN/TunnelManager/WgKeyRotation.swift +++ b/ios/MullvadVPN/TunnelManager/WgKeyRotation.swift @@ -7,8 +7,8 @@ // import Foundation +import MullvadSettings import MullvadTypes -import Settings import class WireGuardKitTypes.PrivateKey import class WireGuardKitTypes.PublicKey diff --git a/ios/MullvadVPN/View controllers/Account/AccountInteractor.swift b/ios/MullvadVPN/View controllers/Account/AccountInteractor.swift index 19d4e39a4c7b..a08bd10064e1 100644 --- a/ios/MullvadVPN/View controllers/Account/AccountInteractor.swift +++ b/ios/MullvadVPN/View controllers/Account/AccountInteractor.swift @@ -8,9 +8,9 @@ import Foundation import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings import StoreKit final class AccountInteractor { diff --git a/ios/MullvadVPN/View controllers/Account/AccountViewController.swift b/ios/MullvadVPN/View controllers/Account/AccountViewController.swift index e8a6bda703c0..30a970280ba9 100644 --- a/ios/MullvadVPN/View controllers/Account/AccountViewController.swift +++ b/ios/MullvadVPN/View controllers/Account/AccountViewController.swift @@ -8,9 +8,9 @@ import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings import StoreKit import UIKit diff --git a/ios/MullvadVPN/View controllers/Login/LoginInteractor.swift b/ios/MullvadVPN/View controllers/Login/LoginInteractor.swift index f7b54a66fe89..4ec56074b1f8 100644 --- a/ios/MullvadVPN/View controllers/Login/LoginInteractor.swift +++ b/ios/MullvadVPN/View controllers/Login/LoginInteractor.swift @@ -8,7 +8,7 @@ import Foundation import MullvadLogging -import Settings +import MullvadSettings final class LoginInteractor { private let tunnelManager: TunnelManager diff --git a/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeInteractor.swift b/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeInteractor.swift index 55032e892be0..8524ff13b0ce 100644 --- a/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeInteractor.swift +++ b/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeInteractor.swift @@ -9,9 +9,9 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings import StoreKit final class OutOfTimeInteractor { diff --git a/ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift b/ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift index eb134361d5c9..a0bf09647db3 100644 --- a/ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift +++ b/ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift @@ -6,7 +6,7 @@ // Copyright © 2021 Mullvad VPN AB. All rights reserved. // -import Settings +import MullvadSettings import UIKit final class PreferencesDataSource: UITableViewDiffableDataSource< diff --git a/ios/MullvadVPN/View controllers/Preferences/PreferencesInteractor.swift b/ios/MullvadVPN/View controllers/Preferences/PreferencesInteractor.swift index bd4a5042a128..c05c40127c00 100644 --- a/ios/MullvadVPN/View controllers/Preferences/PreferencesInteractor.swift +++ b/ios/MullvadVPN/View controllers/Preferences/PreferencesInteractor.swift @@ -7,8 +7,8 @@ // import Foundation +import MullvadSettings import RelayCache -import Settings final class PreferencesInteractor { private let tunnelManager: TunnelManager diff --git a/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift b/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift index 66bda89769c9..850a84b66607 100644 --- a/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift +++ b/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift @@ -6,8 +6,8 @@ // Copyright © 2021 Mullvad VPN AB. All rights reserved. // +import MullvadSettings import MullvadTypes -import Settings import UIKit enum CustomDNSPrecondition { diff --git a/ios/MullvadVPN/View controllers/Settings/SettingsDataSource.swift b/ios/MullvadVPN/View controllers/Settings/SettingsDataSource.swift index 62688ce92d81..1837b85898d9 100644 --- a/ios/MullvadVPN/View controllers/Settings/SettingsDataSource.swift +++ b/ios/MullvadVPN/View controllers/Settings/SettingsDataSource.swift @@ -6,7 +6,7 @@ // Copyright © 2021 Mullvad VPN AB. All rights reserved. // -import Settings +import MullvadSettings import UIKit final class SettingsDataSource: UITableViewDiffableDataSource< diff --git a/ios/MullvadVPN/View controllers/Settings/SettingsInteractor.swift b/ios/MullvadVPN/View controllers/Settings/SettingsInteractor.swift index 3e773c48c662..58b5201cf6c3 100644 --- a/ios/MullvadVPN/View controllers/Settings/SettingsInteractor.swift +++ b/ios/MullvadVPN/View controllers/Settings/SettingsInteractor.swift @@ -7,7 +7,7 @@ // import Foundation -import Settings +import MullvadSettings final class SettingsInteractor { private let tunnelManager: TunnelManager diff --git a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewControllerInteractor.swift b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewControllerInteractor.swift index 3df518ab8468..47adb52703c5 100644 --- a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewControllerInteractor.swift +++ b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewControllerInteractor.swift @@ -7,7 +7,7 @@ // import Foundation -import Settings +import MullvadSettings final class TunnelViewControllerInteractor { private let tunnelManager: TunnelManager diff --git a/ios/MullvadVPNTests/DeviceCheckOperationTests.swift b/ios/MullvadVPNTests/DeviceCheckOperationTests.swift index fa7752e27af6..7ac6592d366b 100644 --- a/ios/MullvadVPNTests/DeviceCheckOperationTests.swift +++ b/ios/MullvadVPNTests/DeviceCheckOperationTests.swift @@ -7,9 +7,9 @@ // import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings import WireGuardKitTypes import XCTest diff --git a/ios/MullvadVPNTests/WgKeyRotationTests.swift b/ios/MullvadVPNTests/WgKeyRotationTests.swift index 923497386163..764886f3724d 100644 --- a/ios/MullvadVPNTests/WgKeyRotationTests.swift +++ b/ios/MullvadVPNTests/WgKeyRotationTests.swift @@ -6,8 +6,8 @@ // Copyright © 2023 Mullvad VPN AB. All rights reserved. // +import MullvadSettings import MullvadTypes -import Settings import struct WireGuardKitTypes.IPAddressRange import class WireGuardKitTypes.PrivateKey import XCTest diff --git a/ios/PacketTunnel/DeviceCheck/DeviceCheckOperation.swift b/ios/PacketTunnel/DeviceCheck/DeviceCheckOperation.swift index 97bbf1df5e2b..ce6f96796a85 100644 --- a/ios/PacketTunnel/DeviceCheck/DeviceCheckOperation.swift +++ b/ios/PacketTunnel/DeviceCheck/DeviceCheckOperation.swift @@ -9,9 +9,9 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTypes import Operations -import Settings import class WireGuardKitTypes.PrivateKey import class WireGuardKitTypes.PublicKey diff --git a/ios/PacketTunnel/DeviceCheck/DeviceStateAccessor.swift b/ios/PacketTunnel/DeviceCheck/DeviceStateAccessor.swift index e90669d0a318..acd87256bf0f 100644 --- a/ios/PacketTunnel/DeviceCheck/DeviceStateAccessor.swift +++ b/ios/PacketTunnel/DeviceCheck/DeviceStateAccessor.swift @@ -7,8 +7,8 @@ // import Foundation +import MullvadSettings import MullvadTypes -import Settings /// An object that provides access to `DeviceState` used by `DeviceCheckOperation`. struct DeviceStateAccessor: DeviceStateAccessorProtocol { diff --git a/ios/PacketTunnel/DeviceCheck/DeviceStateAccessorProtocol.swift b/ios/PacketTunnel/DeviceCheck/DeviceStateAccessorProtocol.swift index 0be6990ba7b6..77e47d2fd93e 100644 --- a/ios/PacketTunnel/DeviceCheck/DeviceStateAccessorProtocol.swift +++ b/ios/PacketTunnel/DeviceCheck/DeviceStateAccessorProtocol.swift @@ -7,7 +7,7 @@ // import Foundation -import Settings +import MullvadSettings /// A protocol that formalizes device state accessor dependency used by `DeviceCheckOperation`. protocol DeviceStateAccessorProtocol { diff --git a/ios/PacketTunnel/PacketTunnelConfiguration.swift b/ios/PacketTunnel/PacketTunnelConfiguration.swift index 601684e6d0e1..ffece5520776 100644 --- a/ios/PacketTunnel/PacketTunnelConfiguration.swift +++ b/ios/PacketTunnel/PacketTunnelConfiguration.swift @@ -7,10 +7,10 @@ // import Foundation +import MullvadSettings import MullvadTypes import protocol Network.IPAddress import RelaySelector -import Settings import WireGuardKit struct PacketTunnelConfiguration { diff --git a/ios/PacketTunnel/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider.swift index 01dfbedf3840..a7c5a22beebf 100644 --- a/ios/PacketTunnel/PacketTunnelProvider.swift +++ b/ios/PacketTunnel/PacketTunnelProvider.swift @@ -9,6 +9,7 @@ import Foundation import MullvadLogging import MullvadREST +import MullvadSettings import MullvadTransport import MullvadTypes import Network @@ -17,7 +18,6 @@ import Operations import PacketTunnelCore import RelayCache import RelaySelector -import Settings import TunnelProviderMessaging import WireGuardKit