diff --git a/example_full/lib/domain/app_service.dart b/example_full/lib/domain/app_service.dart index c7a9d65..7639bd0 100644 --- a/example_full/lib/domain/app_service.dart +++ b/example_full/lib/domain/app_service.dart @@ -349,13 +349,15 @@ extension MessagingExtension on AppService { ); } - void sendFilesResponse(String requestId, {required bool response}) { + void sendFilesResponse(String requestId, {required bool isAccepted}) { if (connectedDevice == null) return; - print('send'); _nearbyService.send( OutgoingNearbyMessage( receiver: connectedDevice!.info, - content: NearbyMessageFilesResponse(id: requestId, isAccepted: response), + content: NearbyMessageFilesResponse( + id: requestId, + isAccepted: isAccepted, + ), ), ); } diff --git a/example_full/lib/presentation/listener/messages_listener.dart b/example_full/lib/presentation/listener/messages_listener.dart index 1b332af..9c13396 100644 --- a/example_full/lib/presentation/listener/messages_listener.dart +++ b/example_full/lib/presentation/listener/messages_listener.dart @@ -36,7 +36,7 @@ class MessagesListener { // accept or dismiss the files request (isAccepted) => context.read().sendFilesResponse( filesRequest.id, - response: isAccepted ?? false, + isAccepted: isAccepted ?? false, ), ); }, diff --git a/lib/src/platforms/android/socket_service/nearby_socket_service.dart b/lib/src/platforms/android/socket_service/nearby_socket_service.dart index e047c0f..8a79cb2 100644 --- a/lib/src/platforms/android/socket_service/nearby_socket_service.dart +++ b/lib/src/platforms/android/socket_service/nearby_socket_service.dart @@ -205,25 +205,25 @@ class NearbySocketService { .cast() .map((e) => MessagesStreamMapper.replaceId(e, _connectedDeviceId)) .listen( - (message) async { - try { - _handleFilesMessage(message); - socketListener.onData(message); - } catch (e) { - Logger.error(e); - } - }, - onDone: () { - state.value = CommunicationChannelState.notConnected; - socketListener.onDone?.call(); - }, - onError: (e, s) { - Logger.error(e); - state.value = CommunicationChannelState.notConnected; - socketListener.onError?.call(e, s); - }, - cancelOnError: socketListener.cancelOnError, - ); + (message) async { + try { + _handleFilesMessage(message); + socketListener.onData(message); + } catch (e) { + Logger.error(e); + } + }, + onDone: () { + state.value = CommunicationChannelState.notConnected; + socketListener.onDone?.call(); + }, + onError: (e, s) { + Logger.error(e); + state.value = CommunicationChannelState.notConnected; + socketListener.onError?.call(e, s); + }, + cancelOnError: socketListener.cancelOnError, + ); } if (_messagesSubscription != null) { state.value = CommunicationChannelState.connected; diff --git a/lib/src/platforms/ios/nearby_ios_service.dart b/lib/src/platforms/ios/nearby_ios_service.dart index 6e8730e..8ff9bd1 100644 --- a/lib/src/platforms/ios/nearby_ios_service.dart +++ b/lib/src/platforms/ios/nearby_ios_service.dart @@ -186,23 +186,19 @@ class NearbyIOSService extends NearbyService { cancelOnError: eventListener.cancelOnError, ); _resourcesSubscription = NearbyServiceIOSPlatform.instance.resourcesStream - .map((event) { - print(event); - return event; - }) .map(ResourcesStreamMapper.toFilesPack) .where((event) => event != null) .cast() .listen( - (e) => filesListener?.onData.call(e), - onDone: filesListener?.onDone, - onError: (e, s) { - Logger.error(e); - _state.value = CommunicationChannelState.notConnected; - filesListener?.onError?.call(e, s); - }, - cancelOnError: filesListener?.cancelOnError, - ); + (e) => filesListener?.onData.call(e), + onDone: filesListener?.onDone, + onError: (e, s) { + Logger.error(e); + _state.value = CommunicationChannelState.notConnected; + filesListener?.onError?.call(e, s); + }, + cancelOnError: filesListener?.cancelOnError, + ); if (_messagesSubscription != null) { Logger.info('Messages subscription was created successfully'); eventListener.onCreated?.call();