Skip to content

Send current Active Markup and Active Options to Connecting Client #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aslakknutsen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Send current Active Markup and Active Options to Connecting Client #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions src/main/java/com/onslyde/websockets/OnslydeWebSocketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,18 @@ of this software and associated documentation files (the "Software"), to
package com.onslyde.websockets;

import com.onslyde.model.Mediator;
import com.onslyde.model.Mediator.SessionTracker;
import com.onslyde.model.SessionManager;
import com.onslyde.util.ClientEvent;

import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.annotations.*;
import org.eclipse.jetty.websocket.server.WebSocketServerConnection;

import javax.enterprise.event.Observes;
import javax.inject.Inject;

import java.io.IOException;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;
Expand Down Expand Up @@ -141,12 +144,16 @@ public void onWebSocketConnect(Session session)
}
System.out.println("_____sessions in map: " + mediator.getSessionID() + " users session: " + sessionID + " size for session: " + mediator.getSessions().get(sessionID).size() + "---" + mediator.getSessions().get(sessionID).get(attendeeIP));

if (getSessionTracker(sessionID) != null) {
List options = getSessionTracker(sessionID).getActiveOptions();
SessionTracker sesionTracker = getSessionTracker(sessionID);
if (sesionTracker != null) {
List options = sesionTracker.getActiveOptions();
if (options.size() == 3) {
//only send options to this connection
this.session.getRemote().sendStringByFuture(ClientEvent.createEvent("updateOptions", options, sessionID));
}
String activeMarkup = sesionTracker.getActiveMarkup();
if(activeMarkup != null) {
this.session.getRemote().sendStringByFuture(ClientEvent.remoteMarkup(activeMarkup,"",sessionID));
}
}
}
} catch (Exception e) {
Expand Down