gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only call folks in call

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-05 21:52:32 +01:00
parent 288d102780
commit 5d9f4456ed
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -449,9 +449,9 @@ public class CallActivity extends AppCompatActivity {
case "offer": case "offer":
case "answer": case "answer":
magicPeerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick()); magicPeerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick());
magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper
.getMagicSdpObserver(), new SessionDescription(SessionDescription.Type.fromCanonicalForm(type), .getMagicSdpObserver(), new SessionDescription(SessionDescription.Type.fromCanonicalForm(type),
ncSignalingMessage.getPayload().getSdp())); ncSignalingMessage.getPayload().getSdp()));
break; break;
case "candidate": case "candidate":
NCIceCandidate ncIceCandidate = ncSignalingMessage.getPayload().getIceCandidate(); NCIceCandidate ncIceCandidate = ncSignalingMessage.getPayload().getIceCandidate();
@ -487,14 +487,12 @@ public class CallActivity extends AppCompatActivity {
List<String> oldSesssions = new ArrayList<>(); List<String> oldSesssions = new ArrayList<>();
for (HashMap<String, String> participant : users) { for (HashMap<String, String> participant : users) {
if (participant.containsKey("sessionId") && !participant.get("sessionId").equals if (!participant.get("sessionId").equals(callSession) && Boolean.parseBoolean(participant.get("inCall"))) {
(callSession)) {
newSessions.add(participant.get("sessionId")); newSessions.add(participant.get("sessionId"));
} }
} }
for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) { for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
if (!magicPeerConnectionWrapper.getSessionId().equals(callSession)) { if (!magicPeerConnectionWrapper.getSessionId().equals(callSession)) {
oldSesssions.add(magicPeerConnectionWrapper.getSessionId()); oldSesssions.add(magicPeerConnectionWrapper.getSessionId());
@ -531,8 +529,8 @@ public class CallActivity extends AppCompatActivity {
private MagicPeerConnectionWrapper alwaysGetPeerConnectionWrapperForSessionId(String sessionId) { private MagicPeerConnectionWrapper alwaysGetPeerConnectionWrapperForSessionId(String sessionId) {
MagicPeerConnectionWrapper magicPeerConnectionWrapper; MagicPeerConnectionWrapper magicPeerConnectionWrapper;
if ((magicPeerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) { if ((magicPeerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) {
return magicPeerConnectionWrapper; return magicPeerConnectionWrapper;
} else { } else {
magicPeerConnectionWrapper = new MagicPeerConnectionWrapper(peerConnectionFactory, magicPeerConnectionWrapper = new MagicPeerConnectionWrapper(peerConnectionFactory,
iceServers, sdpConstraints, sessionId, callSession); iceServers, sdpConstraints, sessionId, callSession);