Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable Module verifier, rename Settings to MullvadSettings #5168

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Disable Module verifier, rename Settings to MullvadSettings #5168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ios/Settings/DNSSettings.swift → ios/MullvadSettings/DNSSettings.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/DeviceState.swift → ios/MullvadSettings/DeviceState.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/KeychainSettingsStore.swift → ...llvadSettings/KeychainSettingsStore.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/Migration.swift → ios/MullvadSettings/Migration.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/MigrationManager.swift → ios/MullvadSettings/MigrationManager.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/Settings.h → ios/MullvadSettings/MullvadSettings.h
View file
Open in desktop
File renamed without changes.
0 ios/Settings/SettingsManager.swift → ios/MullvadSettings/SettingsManager.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/SettingsParser.swift → ios/MullvadSettings/SettingsParser.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/SettingsStore.swift → ios/MullvadSettings/SettingsStore.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/StoredAccountData.swift → ios/MullvadSettings/StoredAccountData.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/StoredDeviceData.swift → ios/MullvadSettings/StoredDeviceData.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/TunnelSettings.swift → ios/MullvadSettings/TunnelSettings.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/TunnelSettingsV1.swift → ios/MullvadSettings/TunnelSettingsV1.swift
View file
Open in desktop
File renamed without changes.
0 ios/Settings/TunnelSettingsV2.swift → ios/MullvadSettings/TunnelSettingsV2.swift
View file
Open in desktop
File renamed without changes.
54 changes: 27 additions & 27 deletions ios/MullvadVPN.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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>"; };
Expand Down Expand Up @@ -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;
};
Expand All @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand All @@ -2333,7 +2333,7 @@
A92ECC2B2A7803A50052F1B1 /* DeviceState.swift */,
A9D96B192A8247C100A5C673 /* MigrationManager.swift */,
);
path = Settings;
path = MullvadSettings;
sourceTree = "<group>";
};
58BDEB9E2A98F6B400F578F2 /* Mocks */ = {
Expand Down Expand Up @@ -2427,6 +2427,7 @@
581943F228F8014500B0CB5E /* MullvadTypes */,
06799ABD28F98E1D00ACD94E /* MullvadREST */,
58FBFBE7291622580020E046 /* MullvadRESTTests */,
58B2FDD42AA71D2A003EB5C6 /* MullvadSettings */,
063F02742902B63F001FA09F /* RelayCache */,
5898D29929017DAC00EB5EBA /* RelaySelector */,
58D223A6294C8A490029F5F8 /* Operations */,
Expand All @@ -2441,7 +2442,6 @@
58C7A4432A863F490060C66F /* PacketTunnelCoreTests */,
7A88DCCF2A8FABBE00D2FF0E /* Routing */,
7A88DCDD2A8FABBE00D2FF0E /* RoutingTests */,
58B2FDD42AA71D2A003EB5C6 /* Settings */,
58CE5E61224146200008646E /* Products */,
584F991F2902CBDD001F858D /* Frameworks */,
);
Expand Down Expand Up @@ -2470,7 +2470,7 @@
58C7A43D2A863F460060C66F /* PacketTunnelCoreTests.xctest */,
7A88DCCE2A8FABBE00D2FF0E /* Routing.framework */,
7A88DCD72A8FABBE00D2FF0E /* RoutingTests.xctest */,
58B2FDD32AA71D2A003EB5C6 /* Settings.framework */,
58B2FDD32AA71D2A003EB5C6 /* MullvadSettings.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -2797,7 +2797,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
58B2FDD62AA71D2A003EB5C6 /* Settings.h in Headers */,
58B2FDD62AA71D2A003EB5C6 /* MullvadSettings.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -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 */,
Expand All @@ -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 */ = {
Expand Down Expand Up @@ -3464,7 +3464,7 @@
58695A9C2A4ADA9100328DB3 /* TunnelObfuscationTests */,
58C7A4352A863F440060C66F /* PacketTunnelCore */,
58C7A43C2A863F450060C66F /* PacketTunnelCoreTests */,
58B2FDD22AA71D2A003EB5C6 /* Settings */,
58B2FDD22AA71D2A003EB5C6 /* MullvadSettings */,
7A88DCCD2A8FABBE00D2FF0E /* Routing */,
7A88DCD62A8FABBE00D2FF0E /* RoutingTests */,
);
Expand Down Expand Up @@ -4328,7 +4328,7 @@
};
58B2FDD82AA71D2A003EB5C6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 58B2FDD22AA71D2A003EB5C6 /* Settings */;
target = 58B2FDD22AA71D2A003EB5C6 /* MullvadSettings */;
targetProxy = 58B2FDD72AA71D2A003EB5C6 /* PBXContainerItemProxy */;
};
58C7A4402A863F470060C66F /* PBXTargetDependency */ = {
Expand Down Expand Up @@ -4481,7 +4481,7 @@
};
58FE25D12AA72802003D1918 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 58B2FDD22AA71D2A003EB5C6 /* Settings */;
target = 58B2FDD22AA71D2A003EB5C6 /* MullvadSettings */;
targetProxy = 58FE25D02AA72802003D1918 /* PBXContainerItemProxy */;
};
7A88DCDA2A8FABBE00D2FF0E /* PBXTargetDependency */ = {
Expand Down Expand Up @@ -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.";
Expand Down Expand Up @@ -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.";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 */,
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/Containers/Root/RootConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import Foundation
import Settings
import MullvadSettings

struct RootDeviceInfoViewModel {
let configuration: RootConfiguration
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/Coordinators/ApplicationCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import Combine
import MullvadREST
import MullvadSettings
import MullvadTypes
import RelayCache
import Routing
import Settings
import UIKit

/**
Expand Down
2 changes: 1 addition & 1 deletion ...lvadVPN/Notifications/Notification Providers/AccountExpiryInAppNotificationProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//

import Foundation
import MullvadSettings
import MullvadTypes
import Settings

final class AccountExpiryInAppNotificationProvider: NotificationProvider, InAppNotificationProvider {
private var accountExpiry: Date?
Expand Down
2 changes: 1 addition & 1 deletion ...vadVPN/Notifications/Notification Providers/AccountExpirySystemNotificationProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import Foundation
import Settings
import MullvadSettings
import UserNotifications

final class AccountExpirySystemNotificationProvider: NotificationProvider, SystemNotificationProvider {
Expand Down
2 changes: 1 addition & 1 deletion ...dVPN/Notifications/Notification Providers/RegisteredDeviceInAppNotificationProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import Foundation
import Settings
import MullvadSettings
import UIKit.UIColor
import UIKit.UIFont

Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/TunnelManager/RedeemVoucherOperation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/TunnelManager/RotateKeyOperation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/TunnelManager/SetAccountOperation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/TunnelManager/TunnelBlockObserver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import Foundation
import Settings
import MullvadSettings

final class TunnelBlockObserver: TunnelObserver {
typealias DidLoadConfigurationHandler = (TunnelManager) -> Void
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/TunnelManager/TunnelInteractor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//

import Foundation
import MullvadSettings
import RelayCache
import RelaySelector
import Settings

protocol TunnelInteractor {
// MARK: - Tunnel manipulation
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/TunnelManager/TunnelManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/TunnelManager/TunnelObserver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import Foundation
import Settings
import MullvadSettings

protocol TunnelObserver: AnyObject {
func tunnelManagerDidLoadConfiguration(_ manager: TunnelManager)
Expand Down
Loading
Loading