Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions jni-wrappers/privmx-endpoint/src/cpp/parsers/parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -749,9 +749,10 @@ parseEvent(JniContextUtils &ctx, std::shared_ptr<privmx::endpoint::core::Event>
event_cast.timestamp,
privmx::wrapper::streamEventData2Java(ctx, event_cast.data)
);
} else if (stream::Events::isStreamNewStreamsEvent(event)) {
privmx::endpoint::stream::StreamNewStreamsEvent event_cast =
stream::Events::extractStreamNewStreamsEvent(event);
}
else if (stream::Events::isRemoteStreamsChangedEvent(event)) {
privmx::endpoint::stream::RemoteStreamsChangedEvent event_cast =
stream::Events::extractRemoteStreamsChangedEvent(event);

return initEvent(
ctx,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public EventRegistrationInfo registerCallback(CallbackRegistration<?> callbackRe
* @param event event data to emit
*/
public <T> void emit(Event<T> event) {
List<Pair> callbacks = EventType.isLibEvent(event) ? getCallbacksByType(event.type) : getCallbacks(event.subscriptions);
List<Pair> callbacks = EventType.isLibEvent(event) ? getCallbacksByType(event.type) : getCallbacks(event.subscriptions,event.type);
for (Pair p : callbacks) {
try {
EventCallback<T> e = (EventCallback<T>) p.callback;
Expand Down Expand Up @@ -154,12 +154,13 @@ private List<Pair> getCallbackList(EventRegistrationInfo eventRegistrationInfo)
/**
* Get list of all callbacks identified by this subscriptionIds.
*/
private List<Pair> getCallbacks(List<String> subscriptionIds) {
private List<Pair> getCallbacks(List<String> subscriptionIds, String eventType) {
synchronized (callbackMap) {
return callbackMap.entrySet()
.stream()
.filter(it ->
it.getKey().subscriptionID != null && subscriptionIds.contains(it.getKey().subscriptionID)
it.getKey().subscriptionID != null && subscriptionIds.contains(it.getKey().subscriptionID) &&
it.getKey().eventType.eventName.equals(eventType)
)
.flatMap(it -> it.getValue().stream())
.collect(Collectors.toList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -799,9 +799,9 @@ public static EventType<StreamLeftEventData> StreamLeftEvent(StreamEventSelector
);
}

public static EventType<NewStreams> StreamNewStreamsEvent(StreamEventSelectorType selectorType, String selectorId) {
public static EventType<NewStreams> RemoteStreamsChangedEvent(StreamEventSelectorType selectorType, String selectorId) {
return new EventType<>(
"StreamNewStreams",
"remoteStreamsChanged",
StreamEventType.STREAMROOM_UPDATE,
selectorType,
selectorId,
Expand Down