chore(lib, example_full): naming fixes
This commit is contained in:
@@ -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,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ class MessagesListener {
|
||||
// accept or dismiss the files request
|
||||
(isAccepted) => context.read<AppService>().sendFilesResponse(
|
||||
filesRequest.id,
|
||||
response: isAccepted ?? false,
|
||||
isAccepted: isAccepted ?? false,
|
||||
),
|
||||
);
|
||||
},
|
||||
|
||||
@@ -205,25 +205,25 @@ class NearbySocketService {
|
||||
.cast<ReceivedNearbyMessage>()
|
||||
.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;
|
||||
|
||||
@@ -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<ReceivedNearbyFilesPack>()
|
||||
.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();
|
||||
|
||||
Reference in New Issue
Block a user