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

Fixed joining

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-07 11:25:20 +01:00
parent 0ba40ce519
commit 84ea98aa12
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,7 @@ import org.webrtc.VideoTrack;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -481,25 +482,24 @@ public class CallActivity extends AppCompatActivity {
private void processUsersInRoom(List<HashMap<String, String>> users) { private void processUsersInRoom(List<HashMap<String, String>> users) {
List<String> newSessions = new ArrayList<>(); List<String> newSessions = new ArrayList<>();
List<String> oldSesssions = new ArrayList<>(); Set<String> oldSesssions = new HashSet<>();
for (HashMap<String, String> participant : users) { for (HashMap<String, String> participant : users) {
Object inCallObject = participant.get("inCall"); Object inCallObject = participant.get("inCall");
if (!participant.get("sessionId").equals(callSession) && (boolean)inCallObject) { if (!participant.get("sessionId").equals(callSession) && (boolean)inCallObject) {
newSessions.add(participant.get("sessionId")); newSessions.add(participant.get("sessionId"));
} else if (!participant.get("sessionId").equals(callSession) && !(boolean)inCallObject) {
oldSesssions.add(participant.get("sessionId"));
} }
} }
for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) { for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
if (!magicPeerConnectionWrapper.getSessionId().equals(callSession)) {
oldSesssions.add(magicPeerConnectionWrapper.getSessionId()); oldSesssions.add(magicPeerConnectionWrapper.getSessionId());
} }
}
// Calculate sessions that left the call // Calculate sessions that left the call
List<String> leftSessions = oldSesssions; oldSesssions.removeAll(newSessions);
leftSessions.removeAll(newSessions);
// Calculate sessions that join the call // Calculate sessions that join the call
newSessions.removeAll(oldSesssions); newSessions.removeAll(oldSesssions);
@ -512,7 +512,7 @@ public class CallActivity extends AppCompatActivity {
alwaysGetPeerConnectionWrapperForSessionId(sessionId); alwaysGetPeerConnectionWrapperForSessionId(sessionId);
} }
for (String sessionId : leftSessions) { for (String sessionId : oldSesssions) {
endPeerConnection(sessionId); endPeerConnection(sessionId);
} }
} }