TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the Hotspot upgrade failed.

Browse Source 
PiperOrigin-RevId: 836521706
This commit is contained in:
Edwin Wu
2025-11-24 23:24:53 -08:00
committed by Copybara-Service
parent 54f38cbf24
commit d48cdd18a2
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWConnection.h
+1 -1
View File
@@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
*
* @param handler The state changed handler to use for the connection.
*/
- (void)setStateChangedHandler:(nw_connection_state_changed_handler_t)handler;
- (void)setStateChangedHandler:(nullable nw_connection_state_changed_handler_t)handler;
/**
* Starts the connection.
internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWConnectionImpl.m
+1 -1
View File
@@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
nw_connection_set_queue(_connection, queue);
}
- (void)setStateChangedHandler:(nw_connection_state_changed_handler_t)handler {
- (void)setStateChangedHandler:(nullable nw_connection_state_changed_handler_t)handler {
nw_connection_set_state_changed_handler(_connection, handler);
}
internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFramework.m
+14 -14
View File
@@ -34,7 +34,7 @@
NS_ASSUME_NONNULL_BEGIN
// An arbitrary timeout that should be pretty lenient.
NSTimeInterval const GNCConnectionTimeoutInSeconds = 2;
NSTimeInterval const GNCConnectionTimeoutInSeconds = 4;
// This doesn't start flaking until 0.000005 seconds, so 0.5 should be plenty of time.
NSTimeInterval const GNCStartDiscoveryTimeoutInSeconds = 0.5;
@@ -429,23 +429,23 @@ NSDictionary<NSString *, NSString *> *GNCTXTRecordForBrowseResult(nw_browse_resu
id<GNCNWConnection> connectionWrapper = [[GNCNWConnectionImpl alloc] init];
[connectionWrapper createConnectionWithEndpoint:endpoint parameters:parameters];
[connectionWrapper setQueue:queue ?: _dispatchQueue];
[connectionWrapper
setStateChangedHandler:^(nw_connection_state_t state, nw_error_t error) {
[condition lock];
// Ignore the preparing state, because it is not a final state.
if (state != nw_connection_state_preparing) {
blockResult = state;
if (error != nil) {
blockError = (__bridge_transfer NSError *)nw_error_copy_cf_error(error);
}
[condition signal];
}
[condition unlock];
}];
[connectionWrapper setStateChangedHandler:^(nw_connection_state_t state, nw_error_t error) {
[condition lock];
// Ignore the preparing state and waiting state, because it is not a final state.
if ((state != nw_connection_state_preparing) && (state != nw_connection_state_waiting)) {
blockResult = state;
if (error != nil) {
blockError = (__bridge_transfer NSError *)nw_error_copy_cf_error(error);
}
[condition signal];
}
[condition unlock];
}];
if (cancelSource) {
dispatch_source_set_event_handler(cancelSource, ^{
GNCLoggerInfo(
@"[GNCNWFramework] Connection to endpoint was cancelled before it could be established.");
[connectionWrapper setStateChangedHandler:nil]; // Prevent callback issues
[connectionWrapper cancel];
dispatch_source_cancel(cancelSource);
});