Skip to content

Commit 8a07e71

Browse files
FlorianUekermannFlorianUekermann
authored
Merge pull request #472 from Sovereign-Engineering/florian/obs-1460-target-state-setting-impl-and-ux
switch to target state setting model
2 parents b6325c6 + a46f114 commit 8a07e71

30 files changed

+917
-668
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ The network extension manages the virtual device and maintains the tunnel using
8989

9090
💡 **TIP**: It is highly recommended to read through various sections in [Development Tips](#development-tips) to better understand the various ways we've configured the Xcode build system to work with our development process.
9191

92+
## Swift unit tests
93+
94+
"Swift Testing" tests are placed in `*Test.swift` files, which need to be a member of the `Tests` target. Testing (not running) with the `Tests` scheme builds and executes all tests.
95+
9296
## Debugging
9397

9498
### Logs

‎apple/client.xcodeproj/project.pbxproj‎

Lines changed: 156 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,19 @@
99
/* Begin PBXBuildFile section */
1010
300452782C49BC90000B78F7 /* Json.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300452772C49BC90000B78F7 /* Json.swift */; };
1111
300452792C49BC90000B78F7 /* Json.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300452772C49BC90000B78F7 /* Json.swift */; };
12+
30497E662D9EC09E008B22F9 /* ConcurrencyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30497E652D9EC09E008B22F9 /* ConcurrencyTests.swift */; };
13+
30497E672D9EC0BA008B22F9 /* Concurrency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35230C152C764B97007ECFEC /* Concurrency.swift */; };
14+
30497E682D9EC129008B22F9 /* Swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35230C182C764F0D007ECFEC /* Swift.swift */; };
15+
30497E692D9EC16A008B22F9 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96C920682CD91D94002C85EA /* String.swift */; };
16+
30497E6A2D9EC19E008B22F9 /* StringError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309B467C2C4C152900A1B00F /* StringError.swift */; };
17+
30497E6B2D9EC7AC008B22F9 /* Sleep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BA9122C45DFC8000A7428 /* Sleep.swift */; };
18+
30497E6E2D9ED584008B22F9 /* Box.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30497E6D2D9ED57F008B22F9 /* Box.swift */; };
19+
30497E6F2D9ED584008B22F9 /* Box.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30497E6D2D9ED57F008B22F9 /* Box.swift */; };
20+
30497E702D9ED5AD008B22F9 /* Box.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30497E6D2D9ED57F008B22F9 /* Box.swift */; };
21+
30497E722D9ED7D4008B22F9 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 30497E712D9ED7D4008B22F9 /* DequeModule */; };
22+
30497E742D9ED7DF008B22F9 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 30497E732D9ED7DF008B22F9 /* DequeModule */; };
23+
30497E762D9ED7E9008B22F9 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 30497E752D9ED7E9008B22F9 /* DequeModule */; };
24+
30497E782D9ED7EE008B22F9 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 30497E772D9ED7EE008B22F9 /* DequeModule */; };
1225
30761C222B6EB17100E5F60D /* ClientApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30761C212B6EB17100E5F60D /* ClientApp.swift */; };
1326
30761C242B6EB17100E5F60D /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30761C232B6EB17100E5F60D /* ContentView.swift */; };
1427
30761C262B6EB17200E5F60D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 30761C252B6EB17200E5F60D /* Assets.xcassets */; };
@@ -36,6 +49,7 @@
3649
309BA90C2C446125000A7428 /* NetworkSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BA90B2C446125000A7428 /* NetworkSettings.swift */; };
3750
309BA9132C45DFC8000A7428 /* Sleep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BA9122C45DFC8000A7428 /* Sleep.swift */; };
3851
309BA9142C45DFC8000A7428 /* Sleep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 309BA9122C45DFC8000A7428 /* Sleep.swift */; };
52+
309BFE3F2D9C169500366431 /* WatchableValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C532092CC9558000936E1F /* WatchableValue.swift */; };
3953
30C5320A2CC9558000936E1F /* WatchableValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C532092CC9558000936E1F /* WatchableValue.swift */; };
4054
30C5320C2CC959AE00936E1F /* OsStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C5320B2CC959AE00936E1F /* OsStatus.swift */; };
4155
30EF74C12BFFE48C0095439F /* FfiCb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30EF74C02BFFE48C0095439F /* FfiCb.swift */; };
@@ -115,6 +129,9 @@
115129

116130
/* Begin PBXFileReference section */
117131
300452772C49BC90000B78F7 /* Json.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Json.swift; sourceTree = "<group>"; };
132+
30497E5E2D9EC038008B22F9 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
133+
30497E652D9EC09E008B22F9 /* ConcurrencyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConcurrencyTests.swift; sourceTree = "<group>"; };
134+
30497E6D2D9ED57F008B22F9 /* Box.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Box.swift; sourceTree = "<group>"; };
118135
30761C1E2B6EB17100E5F60D /* Obscura VPN (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Obscura VPN (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; };
119136
30761C212B6EB17100E5F60D /* ClientApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientApp.swift; sourceTree = "<group>"; };
120137
30761C232B6EB17100E5F60D /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -188,11 +205,20 @@
188205
/* End PBXFileReference section */
189206

190207
/* Begin PBXFrameworksBuildPhase section */
208+
30497E5B2D9EC038008B22F9 /* Frameworks */ = {
209+
isa = PBXFrameworksBuildPhase;
210+
buildActionMask = 2147483647;
211+
files = (
212+
30497E722D9ED7D4008B22F9 /* DequeModule in Frameworks */,
213+
);
214+
runOnlyForDeploymentPostprocessing = 0;
215+
};
191216
30761C1B2B6EB17100E5F60D /* Frameworks */ = {
192217
isa = PBXFrameworksBuildPhase;
193218
buildActionMask = 2147483647;
194219
files = (
195220
A082F8232C46BF5B002AF810 /* Sparkle in Frameworks */,
221+
30497E782D9ED7EE008B22F9 /* DequeModule in Frameworks */,
196222
);
197223
runOnlyForDeploymentPostprocessing = 0;
198224
};
@@ -202,6 +228,7 @@
202228
files = (
203229
30920D942C3D51EC008690C3 /* NetworkExtension.framework in Frameworks */,
204230
30920DA92C3D53F1008690C3 /* libobscuravpn-client.a in Frameworks */,
231+
30497E742D9ED7DF008B22F9 /* DequeModule in Frameworks */,
205232
);
206233
runOnlyForDeploymentPostprocessing = 0;
207234
};
@@ -211,6 +238,7 @@
211238
files = (
212239
C90161572BE011B2005B14AF /* libobscuravpn-client.a in Frameworks */,
213240
3098C18F2B921489008877AA /* NetworkExtension.framework in Frameworks */,
241+
30497E762D9ED7E9008B22F9 /* DequeModule in Frameworks */,
214242
);
215243
runOnlyForDeploymentPostprocessing = 0;
216244
};
@@ -239,6 +267,7 @@
239267
30761C1E2B6EB17100E5F60D /* Obscura VPN (Debug).app */,
240268
3098C18E2B921489008877AA /* net.obscura.vpn-client-app.system-network-extension.systemextension */,
241269
30920D932C3D51EC008690C3 /* App Network Extension.appex */,
270+
30497E5E2D9EC038008B22F9 /* Tests.xctest */,
242271
);
243272
name = Products;
244273
sourceTree = "<group>";
@@ -323,10 +352,12 @@
323352
30EF74BF2BFFC2A90095439F /* shared */ = {
324353
isa = PBXGroup;
325354
children = (
355+
30497E6D2D9ED57F008B22F9 /* Box.swift */,
326356
968B02B82CFF5B7B0053D0EF /* Account.swift */,
327357
96C920682CD91D94002C85EA /* String.swift */,
328358
35230C182C764F0D007ECFEC /* Swift.swift */,
329359
35230C152C764B97007ECFEC /* Concurrency.swift */,
360+
30497E652D9EC09E008B22F9 /* ConcurrencyTests.swift */,
330361
35219C3A2C6BD57F00E63BB8 /* Debug.swift */,
331362
35A6F2532C6121C2004E1A7C /* time.swift */,
332363
352D58DF2C4AE796002F3404 /* ObservableValue.swift */,
@@ -394,6 +425,26 @@
394425
/* End PBXGroup section */
395426

396427
/* Begin PBXNativeTarget section */
428+
30497E5D2D9EC038008B22F9 /* Tests */ = {
429+
isa = PBXNativeTarget;
430+
buildConfigurationList = 30497E622D9EC038008B22F9 /* Build configuration list for PBXNativeTarget "Tests" */;
431+
buildPhases = (
432+
30497E5A2D9EC038008B22F9 /* Sources */,
433+
30497E5B2D9EC038008B22F9 /* Frameworks */,
434+
30497E5C2D9EC038008B22F9 /* Resources */,
435+
);
436+
buildRules = (
437+
);
438+
dependencies = (
439+
);
440+
name = Tests;
441+
packageProductDependencies = (
442+
30497E712D9ED7D4008B22F9 /* DequeModule */,
443+
);
444+
productName = Tests;
445+
productReference = 30497E5E2D9EC038008B22F9 /* Tests.xctest */;
446+
productType = "com.apple.product-type.bundle.unit-test";
447+
};
397448
30761C1D2B6EB17100E5F60D /* Obscura VPN */ = {
398449
isa = PBXNativeTarget;
399450
buildConfigurationList = 30761C2D2B6EB17200E5F60D /* Build configuration list for PBXNativeTarget "Obscura VPN" */;
@@ -411,6 +462,7 @@
411462
name = "Obscura VPN";
412463
packageProductDependencies = (
413464
A082F8222C46BF5B002AF810 /* Sparkle */,
465+
30497E772D9ED7EE008B22F9 /* DequeModule */,
414466
);
415467
productName = client;
416468
productReference = 30761C1E2B6EB17100E5F60D /* Obscura VPN (Debug).app */;
@@ -457,9 +509,12 @@
457509
isa = PBXProject;
458510
attributes = {
459511
BuildIndependentTargetsInParallel = 1;
460-
LastSwiftUpdateCheck = 1520;
512+
LastSwiftUpdateCheck = 1620;
461513
LastUpgradeCheck = 1520;
462514
TargetAttributes = {
515+
30497E5D2D9EC038008B22F9 = {
516+
CreatedOnToolsVersion = 16.2;
517+
};
463518
30761C1D2B6EB17100E5F60D = {
464519
CreatedOnToolsVersion = 15.2;
465520
};
@@ -482,6 +537,7 @@
482537
mainGroup = 30761C152B6EB17100E5F60D;
483538
packageReferences = (
484539
A082F8212C46BF5B002AF810 /* XCRemoteSwiftPackageReference "Sparkle" */,
540+
30497E6C2D9ED476008B22F9 /* XCRemoteSwiftPackageReference "swift-collections" */,
485541
);
486542
productRefGroup = 30761C1F2B6EB17100E5F60D /* Products */;
487543
projectDirPath = "";
@@ -496,6 +552,7 @@
496552
30761C1D2B6EB17100E5F60D /* Obscura VPN */,
497553
3098C18D2B921489008877AA /* System Network Extension */,
498554
30920D922C3D51EC008690C3 /* App Network Extension */,
555+
30497E5D2D9EC038008B22F9 /* Tests */,
499556
);
500557
};
501558
/* End PBXProject section */
@@ -518,6 +575,13 @@
518575
/* End PBXReferenceProxy section */
519576

520577
/* Begin PBXResourcesBuildPhase section */
578+
30497E5C2D9EC038008B22F9 /* Resources */ = {
579+
isa = PBXResourcesBuildPhase;
580+
buildActionMask = 2147483647;
581+
files = (
582+
);
583+
runOnlyForDeploymentPostprocessing = 0;
584+
};
521585
30761C1C2B6EB17100E5F60D /* Resources */ = {
522586
isa = PBXResourcesBuildPhase;
523587
buildActionMask = 2147483647;
@@ -545,6 +609,20 @@
545609
/* End PBXResourcesBuildPhase section */
546610

547611
/* Begin PBXSourcesBuildPhase section */
612+
30497E5A2D9EC038008B22F9 /* Sources */ = {
613+
isa = PBXSourcesBuildPhase;
614+
buildActionMask = 2147483647;
615+
files = (
616+
30497E672D9EC0BA008B22F9 /* Concurrency.swift in Sources */,
617+
30497E702D9ED5AD008B22F9 /* Box.swift in Sources */,
618+
30497E692D9EC16A008B22F9 /* String.swift in Sources */,
619+
30497E6A2D9EC19E008B22F9 /* StringError.swift in Sources */,
620+
30497E662D9EC09E008B22F9 /* ConcurrencyTests.swift in Sources */,
621+
30497E682D9EC129008B22F9 /* Swift.swift in Sources */,
622+
30497E6B2D9EC7AC008B22F9 /* Sleep.swift in Sources */,
623+
);
624+
runOnlyForDeploymentPostprocessing = 0;
625+
};
548626
30761C1A2B6EB17100E5F60D /* Sources */ = {
549627
isa = PBXSourcesBuildPhase;
550628
buildActionMask = 2147483647;
@@ -555,6 +633,7 @@
555633
352D58E02C4AE796002F3404 /* ObservableValue.swift in Sources */,
556634
962325232C8A3B58008A9B76 /* MenuItemView.swift in Sources */,
557635
30C5320C2CC959AE00936E1F /* OsStatus.swift in Sources */,
636+
30497E6E2D9ED584008B22F9 /* Box.swift in Sources */,
558637
9632E4642D19C5EC00BC8E3F /* AccountStatusItem.swift in Sources */,
559638
30920D752C1F71BB008690C3 /* startup.swift in Sources */,
560639
30920D792C2057B1008690C3 /* initNetworkExtension.swift in Sources */,
@@ -605,13 +684,15 @@
605684
files = (
606685
35A6F2552C613366004E1A7C /* time.swift in Sources */,
607686
30EF74CE2C02244C0095439F /* NetworkExtensionIpc.swift in Sources */,
687+
30497E6F2D9ED584008B22F9 /* Box.swift in Sources */,
608688
309BA9142C45DFC8000A7428 /* Sleep.swift in Sources */,
609689
35230C1A2C764F0D007ECFEC /* Swift.swift in Sources */,
610690
352D58E12C4AE796002F3404 /* ObservableValue.swift in Sources */,
611691
30920DAE2C3DC174008690C3 /* InfoDict.swift in Sources */,
612692
35219C3C2C6BD57F00E63BB8 /* Debug.swift in Sources */,
613693
3098C1942B921489008877AA /* main.swift in Sources */,
614694
35230C172C764B97007ECFEC /* Concurrency.swift in Sources */,
695+
309BFE3F2D9C169500366431 /* WatchableValue.swift in Sources */,
615696
309B467E2C4C152900A1B00F /* StringError.swift in Sources */,
616697
309BA90C2C446125000A7428 /* NetworkSettings.swift in Sources */,
617698
300452792C49BC90000B78F7 /* Json.swift in Sources */,
@@ -634,6 +715,43 @@
634715
/* End PBXTargetDependency section */
635716

636717
/* Begin XCBuildConfiguration section */
718+
30497E632D9EC038008B22F9 /* Debug */ = {
719+
isa = XCBuildConfiguration;
720+
buildSettings = {
721+
CODE_SIGN_STYLE = Automatic;
722+
CURRENT_PROJECT_VERSION = 1;
723+
DEVELOPMENT_TEAM = 5G943LR562;
724+
GCC_PREPROCESSOR_DEFINITIONS = (
725+
"DEBUG=1",
726+
"$(inherited)",
727+
);
728+
GENERATE_INFOPLIST_FILE = YES;
729+
MACOSX_DEPLOYMENT_TARGET = 15.2;
730+
MARKETING_VERSION = 1.0;
731+
PRODUCT_BUNDLE_IDENTIFIER = net.obscura.Tests;
732+
PRODUCT_NAME = "$(TARGET_NAME)";
733+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
734+
SWIFT_EMIT_LOC_STRINGS = NO;
735+
SWIFT_VERSION = 5.0;
736+
};
737+
name = Debug;
738+
};
739+
30497E642D9EC038008B22F9 /* Release */ = {
740+
isa = XCBuildConfiguration;
741+
buildSettings = {
742+
CODE_SIGN_STYLE = Automatic;
743+
CURRENT_PROJECT_VERSION = 1;
744+
DEVELOPMENT_TEAM = 5G943LR562;
745+
GENERATE_INFOPLIST_FILE = YES;
746+
MACOSX_DEPLOYMENT_TARGET = 15.2;
747+
MARKETING_VERSION = 1.0;
748+
PRODUCT_BUNDLE_IDENTIFIER = net.obscura.Tests;
749+
PRODUCT_NAME = "$(TARGET_NAME)";
750+
SWIFT_EMIT_LOC_STRINGS = NO;
751+
SWIFT_VERSION = 5.0;
752+
};
753+
name = Release;
754+
};
637755
30761C2C2B6EB17200E5F60D /* Release */ = {
638756
isa = XCBuildConfiguration;
639757
buildSettings = {
@@ -871,6 +989,15 @@
871989
/* End XCBuildConfiguration section */
872990

873991
/* Begin XCConfigurationList section */
992+
30497E622D9EC038008B22F9 /* Build configuration list for PBXNativeTarget "Tests" */ = {
993+
isa = XCConfigurationList;
994+
buildConfigurations = (
995+
30497E632D9EC038008B22F9 /* Debug */,
996+
30497E642D9EC038008B22F9 /* Release */,
997+
);
998+
defaultConfigurationIsVisible = 0;
999+
defaultConfigurationName = Release;
1000+
};
8741001
30761C192B6EB17100E5F60D /* Build configuration list for PBXProject "client" */ = {
8751002
isa = XCConfigurationList;
8761003
buildConfigurations = (
@@ -910,6 +1037,14 @@
9101037
/* End XCConfigurationList section */
9111038

9121039
/* Begin XCRemoteSwiftPackageReference section */
1040+
30497E6C2D9ED476008B22F9 /* XCRemoteSwiftPackageReference "swift-collections" */ = {
1041+
isa = XCRemoteSwiftPackageReference;
1042+
repositoryURL = "https://github.com/apple/swift-collections.git";
1043+
requirement = {
1044+
kind = upToNextMajorVersion;
1045+
minimumVersion = 1.1.4;
1046+
};
1047+
};
9131048
A082F8212C46BF5B002AF810 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
9141049
isa = XCRemoteSwiftPackageReference;
9151050
repositoryURL = "https://github.com/sparkle-project/Sparkle";
@@ -921,6 +1056,26 @@
9211056
/* End XCRemoteSwiftPackageReference section */
9221057

9231058
/* Begin XCSwiftPackageProductDependency section */
1059+
30497E712D9ED7D4008B22F9 /* DequeModule */ = {
1060+
isa = XCSwiftPackageProductDependency;
1061+
package = 30497E6C2D9ED476008B22F9 /* XCRemoteSwiftPackageReference "swift-collections" */;
1062+
productName = DequeModule;
1063+
};
1064+
30497E732D9ED7DF008B22F9 /* DequeModule */ = {
1065+
isa = XCSwiftPackageProductDependency;
1066+
package = 30497E6C2D9ED476008B22F9 /* XCRemoteSwiftPackageReference "swift-collections" */;
1067+
productName = DequeModule;
1068+
};
1069+
30497E752D9ED7E9008B22F9 /* DequeModule */ = {
1070+
isa = XCSwiftPackageProductDependency;
1071+
package = 30497E6C2D9ED476008B22F9 /* XCRemoteSwiftPackageReference "swift-collections" */;
1072+
productName = DequeModule;
1073+
};
1074+
30497E772D9ED7EE008B22F9 /* DequeModule */ = {
1075+
isa = XCSwiftPackageProductDependency;
1076+
package = 30497E6C2D9ED476008B22F9 /* XCRemoteSwiftPackageReference "swift-collections" */;
1077+
productName = DequeModule;
1078+
};
9241079
A082F8222C46BF5B002AF810 /* Sparkle */ = {
9251080
isa = XCSwiftPackageProductDependency;
9261081
package = A082F8212C46BF5B002AF810 /* XCRemoteSwiftPackageReference "Sparkle" */;

‎apple/client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apple/client/LoginItem.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ import ServiceManagement
33

44
private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "loginitem")
55

6-
func unregisterAsLoginItem() throws {
6+
func unregisterAsLoginItem() throws(String) {
77
do {
88
try SMAppService.mainApp.unregister()
99
} catch {
10-
logger.info("failed to unregister app at login")
11-
throw error
10+
logger.error("failed to unregister app at login \(error, privacy: .public)")
11+
throw errorCodeOther
1212
}
1313
}
1414

15-
func registerAsLoginItem() throws {
15+
func registerAsLoginItem() throws(String) {
1616
do {
1717
try SMAppService.mainApp.register()
1818
} catch {
19-
logger.info("failed to register app at login")
20-
throw error
19+
logger.error("failed to register app at login \(error, privacy: .public)")
20+
throw errorCodeOther
2121
}
2222
}
2323

‎apple/client/ScriptMessageHandlers.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class CommandHandler: NSObject, WKScriptMessageHandlerWithReply {
2323
do {
2424
let response = try await handleWebViewCommand(command: command)
2525
replyHandler(response, nil)
26-
} catch {
27-
replyHandler(nil, error.localizedDescription)
26+
} catch let error as String {
27+
replyHandler(nil, error)
2828
}
2929
}
3030
}

0 commit comments

Comments
 (0)