From 903ff82deccf29c7ba3d739ce5dca7ab2ff236af Mon Sep 17 00:00:00 2001 From: hiddify Date: Sat, 23 Dec 2023 09:57:56 +0330 Subject: [PATCH] fix: ios launch bug --- ios/Runner.xcodeproj/project.pbxproj | 27 ++----------------- .../SingBox/ExtensionPlatformInterface.swift | 10 +++---- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 10130837..dce4ac2a 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -27,12 +27,7 @@ 03E392D02ADDF1BD000ADF15 /* FilePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392CE2ADDEFC8000ADF15 /* FilePath.swift */; }; 03E392D22ADDF1F4000ADF15 /* ExtensionPlatformInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392D12ADDF1F4000ADF15 /* ExtensionPlatformInterface.swift */; }; 03E392D42ADDF262000ADF15 /* Extension+RunBlocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392D32ADDF262000ADF15 /* Extension+RunBlocking.swift */; }; - 073695372B1FD5A8007249BE /* libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; }; - 073695382B1FD5A8007249BE /* libcore.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 073695502B1FED8C007249BE /* App.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07A63A842B1E72AE00CAFA4D /* App.xcframework */; }; - 073695512B1FED8C007249BE /* App.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 07A63A842B1E72AE00CAFA4D /* App.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 073695562B1FEDC2007249BE /* Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07A63A872B1E72C800CAFA4D /* Flutter.xcframework */; }; - 073695572B1FEDC2007249BE /* Flutter.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 07A63A872B1E72C800CAFA4D /* Flutter.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 073695582B36B248007249BE /* libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; }; 075637BA2B01583F005AFB8E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60F1D4AAC33ACF5C8307310D /* Pods_Runner.framework */; }; 075637BB2B01583F005AFB8E /* Pods_Runner.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 60F1D4AAC33ACF5C8307310D /* Pods_Runner.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 075637BC2B015864005AFB8E /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E392B72ADDA00E000ADF15 /* NetworkExtension.framework */; }; @@ -59,13 +54,6 @@ remoteGlobalIDString = 03E392B52ADDA00E000ADF15; remoteInfo = SingBoxPacketTunnel; }; - 07EE83022B1E682800086BF6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 97C146E61CF9000F007C117D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 03E392B52ADDA00E000ADF15; - remoteInfo = SingBoxPacketTunnel; - }; 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 97C146E61CF9000F007C117D /* Project object */; @@ -116,10 +104,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 073695572B1FEDC2007249BE /* Flutter.xcframework in Embed Frameworks */, - 073695382B1FD5A8007249BE /* libcore.xcframework in Embed Frameworks */, 075637BB2B01583F005AFB8E /* Pods_Runner.framework in Embed Frameworks */, - 073695512B1FED8C007249BE /* App.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -226,9 +211,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 073695502B1FED8C007249BE /* App.xcframework in Frameworks */, - 073695372B1FD5A8007249BE /* libcore.xcframework in Frameworks */, - 073695562B1FEDC2007249BE /* Flutter.xcframework in Frameworks */, + 073695582B36B248007249BE /* libcore.xcframework in Frameworks */, 075637BA2B01583F005AFB8E /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -471,7 +454,6 @@ ); dependencies = ( 03E392BF2ADDA00F000ADF15 /* PBXTargetDependency */, - 07EE83032B1E682800086BF6 /* PBXTargetDependency */, ); name = Runner; productName = Runner; @@ -704,11 +686,6 @@ target = 03E392B52ADDA00E000ADF15 /* SingBoxPacketTunnel */; targetProxy = 03E392BE2ADDA00F000ADF15 /* PBXContainerItemProxy */; }; - 07EE83032B1E682800086BF6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 03E392B52ADDA00E000ADF15 /* SingBoxPacketTunnel */; - targetProxy = 07EE83022B1E682800086BF6 /* PBXContainerItemProxy */; - }; 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 97C146ED1CF9000F007C117D /* Runner */; diff --git a/ios/SingBoxPacketTunnel/SingBox/ExtensionPlatformInterface.swift b/ios/SingBoxPacketTunnel/SingBox/ExtensionPlatformInterface.swift index 30af6579..8d8bb9fb 100644 --- a/ios/SingBoxPacketTunnel/SingBox/ExtensionPlatformInterface.swift +++ b/ios/SingBoxPacketTunnel/SingBox/ExtensionPlatformInterface.swift @@ -51,7 +51,7 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc let ipv4AddressIterator = options.getInet4Address()! while ipv4AddressIterator.hasNext() { let ipv4Prefix = ipv4AddressIterator.next()! - ipv4Address.append(ipv4Prefix.address) + ipv4Address.append(ipv4Prefix.address()) ipv4Mask.append(ipv4Prefix.mask()) } let ipv4Settings = NEIPv4Settings(addresses: ipv4Address, subnetMasks: ipv4Mask) @@ -60,7 +60,7 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc if inet4RouteAddressIterator.hasNext() { while inet4RouteAddressIterator.hasNext() { let ipv4RoutePrefix = inet4RouteAddressIterator.next()! - ipv4Routes.append(NEIPv4Route(destinationAddress: ipv4RoutePrefix.address, subnetMask: ipv4RoutePrefix.mask())) + ipv4Routes.append(NEIPv4Route(destinationAddress: ipv4RoutePrefix.address(), subnetMask: ipv4RoutePrefix.mask())) } } else { ipv4Routes.append(NEIPv4Route.default()) @@ -76,8 +76,8 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc let ipv6AddressIterator = options.getInet6Address()! while ipv6AddressIterator.hasNext() { let ipv6Prefix = ipv6AddressIterator.next()! - ipv6Address.append(ipv6Prefix.address) - ipv6Prefixes.append(NSNumber(value: ipv6Prefix.prefix)) + ipv6Address.append(ipv6Prefix.address()) + ipv6Prefixes.append(NSNumber(value: ipv6Prefix.prefix())) } let ipv6Settings = NEIPv6Settings(addresses: ipv6Address, networkPrefixLengths: ipv6Prefixes) var ipv6Routes: [NEIPv6Route] = [] @@ -85,7 +85,7 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc if inet6RouteAddressIterator.hasNext() { while inet6RouteAddressIterator.hasNext() { let ipv6RoutePrefix = inet4RouteAddressIterator.next()! - ipv6Routes.append(NEIPv6Route(destinationAddress: ipv6RoutePrefix.description, networkPrefixLength: NSNumber(value: ipv6RoutePrefix.prefix))) + ipv6Routes.append(NEIPv6Route(destinationAddress: ipv6RoutePrefix.description, networkPrefixLength: NSNumber(value: ipv6RoutePrefix.prefix()))) } } else { ipv6Routes.append(NEIPv6Route.default())