vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

fix: ios launch bug

Browse Source
This commit is contained in:
hiddify
2023-12-23 09:57:56 +03:30
parent c74f2e4b16
commit 903ff82dec
2 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -27,12 +27,7 @@
03E392D02ADDF1BD000ADF15 /* FilePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392CE2ADDEFC8000ADF15 /* FilePath.swift */; }; 03E392D02ADDF1BD000ADF15 /* FilePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392CE2ADDEFC8000ADF15 /* FilePath.swift */; };
03E392D22ADDF1F4000ADF15 /* ExtensionPlatformInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392D12ADDF1F4000ADF15 /* ExtensionPlatformInterface.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 */; }; 03E392D42ADDF262000ADF15 /* Extension+RunBlocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392D32ADDF262000ADF15 /* Extension+RunBlocking.swift */; };
073695372B1FD5A8007249BE /* libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; }; 073695582B36B248007249BE /* 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, ); }; };
075637BA2B01583F005AFB8E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60F1D4AAC33ACF5C8307310D /* Pods_Runner.framework */; }; 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, ); }; }; 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 */; }; 075637BC2B015864005AFB8E /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E392B72ADDA00E000ADF15 /* NetworkExtension.framework */; };
@@ -59,13 +54,6 @@
remoteGlobalIDString = 03E392B52ADDA00E000ADF15; remoteGlobalIDString = 03E392B52ADDA00E000ADF15;
remoteInfo = SingBoxPacketTunnel; remoteInfo = SingBoxPacketTunnel;
}; };
07EE83022B1E682800086BF6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 97C146E61CF9000F007C117D /* Project object */;
proxyType = 1;
remoteGlobalIDString = 03E392B52ADDA00E000ADF15;
remoteInfo = SingBoxPacketTunnel;
};
331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 97C146E61CF9000F007C117D /* Project object */; containerPortal = 97C146E61CF9000F007C117D /* Project object */;
@@ -116,10 +104,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
073695572B1FEDC2007249BE /* Flutter.xcframework in Embed Frameworks */,
073695382B1FD5A8007249BE /* libcore.xcframework in Embed Frameworks */,
075637BB2B01583F005AFB8E /* Pods_Runner.framework in Embed Frameworks */, 075637BB2B01583F005AFB8E /* Pods_Runner.framework in Embed Frameworks */,
073695512B1FED8C007249BE /* App.xcframework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@@ -226,9 +211,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
073695502B1FED8C007249BE /* App.xcframework in Frameworks */, 073695582B36B248007249BE /* libcore.xcframework in Frameworks */,
073695372B1FD5A8007249BE /* libcore.xcframework in Frameworks */,
073695562B1FEDC2007249BE /* Flutter.xcframework in Frameworks */,
075637BA2B01583F005AFB8E /* Pods_Runner.framework in Frameworks */, 075637BA2B01583F005AFB8E /* Pods_Runner.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@@ -471,7 +454,6 @@
); );
dependencies = ( dependencies = (
03E392BF2ADDA00F000ADF15 /* PBXTargetDependency */, 03E392BF2ADDA00F000ADF15 /* PBXTargetDependency */,
07EE83032B1E682800086BF6 /* PBXTargetDependency */,
); );
name = Runner; name = Runner;
productName = Runner; productName = Runner;
@@ -704,11 +686,6 @@
target = 03E392B52ADDA00E000ADF15 /* SingBoxPacketTunnel */; target = 03E392B52ADDA00E000ADF15 /* SingBoxPacketTunnel */;
targetProxy = 03E392BE2ADDA00F000ADF15 /* PBXContainerItemProxy */; targetProxy = 03E392BE2ADDA00F000ADF15 /* PBXContainerItemProxy */;
}; };
07EE83032B1E682800086BF6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 03E392B52ADDA00E000ADF15 /* SingBoxPacketTunnel */;
targetProxy = 07EE83022B1E682800086BF6 /* PBXContainerItemProxy */;
};
331C8086294A63A400263BE5 /* PBXTargetDependency */ = { 331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 97C146ED1CF9000F007C117D /* Runner */; target = 97C146ED1CF9000F007C117D /* Runner */;

10
ios/SingBoxPacketTunnel/SingBox/ExtensionPlatformInterface.swift
View File

@@ -51,7 +51,7 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc
let ipv4AddressIterator = options.getInet4Address()! let ipv4AddressIterator = options.getInet4Address()!
while ipv4AddressIterator.hasNext() { while ipv4AddressIterator.hasNext() {
let ipv4Prefix = ipv4AddressIterator.next()! let ipv4Prefix = ipv4AddressIterator.next()!
ipv4Address.append(ipv4Prefix.address) ipv4Address.append(ipv4Prefix.address())
ipv4Mask.append(ipv4Prefix.mask()) ipv4Mask.append(ipv4Prefix.mask())
} }
let ipv4Settings = NEIPv4Settings(addresses: ipv4Address, subnetMasks: ipv4Mask) let ipv4Settings = NEIPv4Settings(addresses: ipv4Address, subnetMasks: ipv4Mask)
@@ -60,7 +60,7 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc
if inet4RouteAddressIterator.hasNext() { if inet4RouteAddressIterator.hasNext() {
while inet4RouteAddressIterator.hasNext() { while inet4RouteAddressIterator.hasNext() {
let ipv4RoutePrefix = inet4RouteAddressIterator.next()! let ipv4RoutePrefix = inet4RouteAddressIterator.next()!
ipv4Routes.append(NEIPv4Route(destinationAddress: ipv4RoutePrefix.address, subnetMask: ipv4RoutePrefix.mask())) ipv4Routes.append(NEIPv4Route(destinationAddress: ipv4RoutePrefix.address(), subnetMask: ipv4RoutePrefix.mask()))
} }
} else { } else {
ipv4Routes.append(NEIPv4Route.default()) ipv4Routes.append(NEIPv4Route.default())
@@ -76,8 +76,8 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc
let ipv6AddressIterator = options.getInet6Address()! let ipv6AddressIterator = options.getInet6Address()!
while ipv6AddressIterator.hasNext() { while ipv6AddressIterator.hasNext() {
let ipv6Prefix = ipv6AddressIterator.next()! let ipv6Prefix = ipv6AddressIterator.next()!
ipv6Address.append(ipv6Prefix.address) ipv6Address.append(ipv6Prefix.address())
ipv6Prefixes.append(NSNumber(value: ipv6Prefix.prefix)) ipv6Prefixes.append(NSNumber(value: ipv6Prefix.prefix()))
} }
let ipv6Settings = NEIPv6Settings(addresses: ipv6Address, networkPrefixLengths: ipv6Prefixes) let ipv6Settings = NEIPv6Settings(addresses: ipv6Address, networkPrefixLengths: ipv6Prefixes)
var ipv6Routes: [NEIPv6Route] = [] var ipv6Routes: [NEIPv6Route] = []
@@ -85,7 +85,7 @@ public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtoc
if inet6RouteAddressIterator.hasNext() { if inet6RouteAddressIterator.hasNext() {
while inet6RouteAddressIterator.hasNext() { while inet6RouteAddressIterator.hasNext() {
let ipv6RoutePrefix = inet4RouteAddressIterator.next()! 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 { } else {
ipv6Routes.append(NEIPv6Route.default()) ipv6Routes.append(NEIPv6Route.default())