talksik/nearby_service
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(lib, example_full): naming fixes

Browse Source
This commit is contained in:
ksenia312
2024-02-06 22:26:58 +01:00
parent 66c6f17b99
commit e4a4a542e6
4 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example_full/lib/domain/app_service.dart
+5 -3
View File
@@ -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; if (connectedDevice == null) return;
print('send');
_nearbyService.send( _nearbyService.send(
OutgoingNearbyMessage( OutgoingNearbyMessage(
receiver: connectedDevice!.info, receiver: connectedDevice!.info,
content: NearbyMessageFilesResponse(id: requestId, isAccepted: response), content: NearbyMessageFilesResponse(
id: requestId,
isAccepted: isAccepted,
),
), ),
); );
} }
example_full/lib/presentation/listener/messages_listener.dart
+1 -1
View File
@@ -36,7 +36,7 @@ class MessagesListener {
// accept or dismiss the files request // accept or dismiss the files request
(isAccepted) => context.read<AppService>().sendFilesResponse( (isAccepted) => context.read<AppService>().sendFilesResponse(
filesRequest.id, filesRequest.id,
response: isAccepted ?? false, isAccepted: isAccepted ?? false,
), ),
); );
}, },
lib/src/platforms/android/socket_service/nearby_socket_service.dart
+19 -19
View File
@@ -205,25 +205,25 @@ class NearbySocketService {
.cast<ReceivedNearbyMessage>() .cast<ReceivedNearbyMessage>()
.map((e) => MessagesStreamMapper.replaceId(e, _connectedDeviceId)) .map((e) => MessagesStreamMapper.replaceId(e, _connectedDeviceId))
.listen( .listen(
(message) async { (message) async {
try { try {
_handleFilesMessage(message); _handleFilesMessage(message);
socketListener.onData(message); socketListener.onData(message);
} catch (e) { } catch (e) {
Logger.error(e); Logger.error(e);
} }
}, },
onDone: () { onDone: () {
state.value = CommunicationChannelState.notConnected; state.value = CommunicationChannelState.notConnected;
socketListener.onDone?.call(); socketListener.onDone?.call();
}, },
onError: (e, s) { onError: (e, s) {
Logger.error(e); Logger.error(e);
state.value = CommunicationChannelState.notConnected; state.value = CommunicationChannelState.notConnected;
socketListener.onError?.call(e, s); socketListener.onError?.call(e, s);
}, },
cancelOnError: socketListener.cancelOnError, cancelOnError: socketListener.cancelOnError,
); );
} }
if (_messagesSubscription != null) { if (_messagesSubscription != null) {
state.value = CommunicationChannelState.connected; state.value = CommunicationChannelState.connected;
lib/src/platforms/ios/nearby_ios_service.dart
+9 -13
View File
@@ -186,23 +186,19 @@ class NearbyIOSService extends NearbyService {
cancelOnError: eventListener.cancelOnError, cancelOnError: eventListener.cancelOnError,
); );
_resourcesSubscription = NearbyServiceIOSPlatform.instance.resourcesStream _resourcesSubscription = NearbyServiceIOSPlatform.instance.resourcesStream
.map((event) {
print(event);
return event;
})
.map(ResourcesStreamMapper.toFilesPack) .map(ResourcesStreamMapper.toFilesPack)
.where((event) => event != null) .where((event) => event != null)
.cast<ReceivedNearbyFilesPack>() .cast<ReceivedNearbyFilesPack>()
.listen( .listen(
(e) => filesListener?.onData.call(e), (e) => filesListener?.onData.call(e),
onDone: filesListener?.onDone, onDone: filesListener?.onDone,
onError: (e, s) { onError: (e, s) {
Logger.error(e); Logger.error(e);
_state.value = CommunicationChannelState.notConnected; _state.value = CommunicationChannelState.notConnected;
filesListener?.onError?.call(e, s); filesListener?.onError?.call(e, s);
}, },
cancelOnError: filesListener?.cancelOnError, cancelOnError: filesListener?.cancelOnError,
); );
if (_messagesSubscription != null) { if (_messagesSubscription != null) {
Logger.info('Messages subscription was created successfully'); Logger.info('Messages subscription was created successfully');
eventListener.onCreated?.call(); eventListener.onCreated?.call();