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

Remove support for iOS 14 #417

Merged
merged 8 commits into from
Apr 22, 2024
Merged

Remove support for iOS 14 #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb5c6d2
refactor(payments): set DEPLOYMENT_TARGET to 15.0
jurajhilje Dec 4, 2023
09b1824
refactor: update NETunnelProviderProtocol+Ext.swift
jurajhilje Dec 13, 2023
065d147
refactor: update VPNManager.swift
jurajhilje Dec 13, 2023
90ff104
refactor: update SettingsViewController.swift
jurajhilje Dec 13, 2023
52a7428
refactor: remove StaticWebViewController.swift
jurajhilje Dec 13, 2023
202cc98
refactor: update Signup.storyboard
jurajhilje Dec 13, 2023
d542e94
refactor: update UIApplication+Ext.swift
jurajhilje Jan 8, 2024
89498a8
Merge branch 'develop' into task/remove-ios-14-support-2
jurajhilje Apr 22, 2024
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
46 changes: 21 additions & 25 deletions IVPNClient.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@
82A6D74A24A3780B00D6C0E1 /* ConnectToServerPopupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A6D74924A3780B00D6C0E1 /* ConnectToServerPopupView.swift */; };
82A7F10523C8661B0015A357 /* ServiceStatusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A7F10423C8661B0015A357 /* ServiceStatusTests.swift */; };
82AA8818231E330A00E18ECB /* SessionStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82AA8817231E330A00E18ECB /* SessionStatus.swift */; };
82AAF0E92253A4A8005E792F /* StaticWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82AAF0E82253A4A8005E792F /* StaticWebViewController.swift */; };
82AB0875291A6B5F0084625A /* AddCustomPortViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82AB0874291A6B5F0084625A /* AddCustomPortViewController.swift */; };
82AB0877291A6B9C0084625A /* CustomPort+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82AB0876291A6B9C0084625A /* CustomPort+CoreDataClass.swift */; };
82AB0879291A6BB90084625A /* CustomPort+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82AB0878291A6BB90084625A /* CustomPort+CoreDataProperties.swift */; };
Expand Down Expand Up @@ -620,7 +619,6 @@
82A9E8C323471EBE007BCA7E /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
82A9E8C423471EBE007BCA7E /* staging.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staging.xcconfig; sourceTree = "<group>"; };
82AA8817231E330A00E18ECB /* SessionStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionStatus.swift; sourceTree = "<group>"; };
82AAF0E82253A4A8005E792F /* StaticWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StaticWebViewController.swift; sourceTree = "<group>"; };
82AB0874291A6B5F0084625A /* AddCustomPortViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddCustomPortViewController.swift; sourceTree = "<group>"; };
82AB0876291A6B9C0084625A /* CustomPort+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CustomPort+CoreDataClass.swift"; sourceTree = "<group>"; };
82AB0878291A6BB90084625A /* CustomPort+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CustomPort+CoreDataProperties.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1263,7 +1261,6 @@
8252747D21F1F80400D4B8B5 /* ServerViewController.swift */,
828772F8221C01C300D5E330 /* ServersConfigurationTableViewController.swift */,
8221377A2227E75E001E1BF5 /* CustomDNSViewController.swift */,
82AAF0E82253A4A8005E792F /* StaticWebViewController.swift */,
8269CAC22264962F00CF488A /* AntiTrackerViewController.swift */,
82F917382344861A0025ED3A /* TermsOfServiceViewController.swift */,
8201A5032356536B008C83DB /* UpgradePlanViewController.swift */,
Expand Down Expand Up @@ -2323,7 +2320,6 @@
823FFB072338DF1800F91A5D /* Capability.swift in Sources */,
82061F65238D2730009DDF4D /* Ping.swift in Sources */,
82AB0879291A6BB90084625A /* CustomPort+CoreDataProperties.swift in Sources */,
82AAF0E92253A4A8005E792F /* StaticWebViewController.swift in Sources */,
8282482A225C7312001314F8 /* WireGuardRegenerationRateCell.swift in Sources */,
824777EA21A6BC3A001EEFAF /* Network+CoreDataProperties.swift in Sources */,
82C34D6E26FB02F900F06016 /* WireGuardEndpoint.swift in Sources */,
Expand Down Expand Up @@ -2529,7 +2525,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = UnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2560,7 +2556,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = UnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2596,7 +2592,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "wireguard-tunnel-provider/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2636,7 +2632,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "wireguard-tunnel-provider/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2668,7 +2664,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = UITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2697,7 +2693,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = UITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2725,7 +2721,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = UITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2792,7 +2788,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "";
Expand Down Expand Up @@ -2821,7 +2817,7 @@
);
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "$(SRCROOT)/IVPNClient/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2857,7 +2853,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = UnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2903,7 +2899,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "openvpn-tunnel-provider/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2946,7 +2942,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "wireguard-tunnel-provider/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2985,7 +2981,7 @@
INFOPLIST_FILE = IVPNWidget/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = IVPNWidget;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 IVPN. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -3020,7 +3016,7 @@
INFOPLIST_FILE = IVPNWidget/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = IVPNWidget;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 IVPN. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -3054,7 +3050,7 @@
INFOPLIST_FILE = IVPNWidget/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = IVPNWidget;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 IVPN. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -3098,7 +3094,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "openvpn-tunnel-provider/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -3150,7 +3146,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "openvpn-tunnel-provider/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -3224,7 +3220,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "";
Expand Down Expand Up @@ -3281,7 +3277,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -3310,7 +3306,7 @@
);
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "$(SRCROOT)/IVPNClient/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -3349,7 +3345,7 @@
);
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/IVPNClient/liboqs/include\"";
INFOPLIST_FILE = "$(SRCROOT)/IVPNClient/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
9 changes: 0 additions & 9 deletions IVPNClient/Managers/NavigationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,6 @@ class NavigationManager {
return navController!
}

static func getStaticWebViewController(resourceName: String, screenTitle: String) -> UIViewController {
let storyBoard = UIStoryboard(name: "Main", bundle: nil)
let viewController = storyBoard.instantiateViewController(withIdentifier: "staticWebView") as! StaticWebViewController
viewController.resourceName = resourceName
viewController.screenTitle = screenTitle

return viewController
}

static func getTermsOfServiceViewController() -> UIViewController {
let storyBoard = UIStoryboard(name: "Initial", bundle: nil)

Expand Down
18 changes: 6 additions & 12 deletions IVPNClient/Managers/VPNManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,8 @@ class VPNManager {
manager.saveToPreferences { error in
if let error = error, error.code == 5 {
manager.isOnDemandEnabled = false
if #available(iOS 15.1, *) {
if #available(iOS 16, *) { } else {
manager.protocolConfiguration?.includeAllNetworks = false
}
if #available(iOS 16, *) { } else {
manager.protocolConfiguration?.includeAllNetworks = false
}
NotificationCenter.default.post(name: Notification.Name.VPNConfigurationDisabled, object: nil)
return
Expand Down Expand Up @@ -271,10 +269,8 @@ class VPNManager {
manager.loadFromPreferences { _ in
manager.onDemandRules = [NEOnDemandRule]()
manager.isOnDemandEnabled = false
if #available(iOS 15.1, *) {
if #available(iOS 16, *) { } else {
manager.protocolConfiguration?.includeAllNetworks = false
}
if #available(iOS 16, *) { } else {
manager.protocolConfiguration?.includeAllNetworks = false
}
manager.saveToPreferences { _ in }
}
Expand Down Expand Up @@ -326,10 +322,8 @@ class VPNManager {
manager.loadFromPreferences { _ in
manager.onDemandRules = [NEOnDemandRule]()
manager.isOnDemandEnabled = false
if #available(iOS 15.1, *) {
if #available(iOS 16, *) { } else {
manager.protocolConfiguration?.includeAllNetworks = false
}
if #available(iOS 16, *) { } else {
manager.protocolConfiguration?.includeAllNetworks = false
}
manager.saveToPreferences(completionHandler: completion)
}
Expand Down
Loading
Loading