Skip to content

fix(CallActivity): check participant's nextcloud session ids if not MCU #5681

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
xandris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(CallActivity): check participant's nextcloud session ids if not MCU #5681

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2123,11 +2123,12 @@ class CallActivity : CallBaseActivity() {

for (participant in participantsInCall) {
val inCallFlag = participant.inCall
if (participant.sessionId != currentSessionId) {
val participantSession = if (hasMCU) participant.sessionId else participant.nextcloudSessionId
if (participantSession != callSession) {
Log.d(
TAG,
" inCallFlag of participant " +
participant.sessionId!!.substring(0, SESSION_ID_PREFFIX_END) +
participantSession!!.substring(0, SESSION_ID_PREFFIX_END) +
" : " +
inCallFlag
)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/nextcloud/talk/call/CallParticipantList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ private Participant copyParticipant(Participant participant) {
copiedParticipant.setInternal(participant.getInternal());
copiedParticipant.setLastPing(participant.getLastPing());
copiedParticipant.setSessionId(participant.getSessionId());
copiedParticipant.setNextcloudSessionId(participant.getNextcloudSessionId());
copiedParticipant.setType(participant.getType());
copiedParticipant.setUserId(participant.getUserId());

Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ data class Participant(
@JsonField(name = ["sessionId"])
var sessionId: String? = null,

@JsonField(name = ["nextcloudSessionId"])
var nextcloudSessionId: String? = null,

@JsonField(name = ["sessionIds"])
var sessionIds: ArrayList<String> = ArrayList(0),

Expand Down Expand Up @@ -80,7 +83,7 @@ data class Participant(
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
constructor() : this(
null, null, null, null, null, null, null, null, null,
0, null, ArrayList(0), 0, 0, null,
0, null, null, ArrayList(0), 0, 0, null,
null, null
)

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ private Participant getParticipantFromMessageMap(Map<String, Object> participant
participant.setInCall(Long.parseLong(participantMap.get("inCall").toString()));
participant.setLastPing(Long.parseLong(participantMap.get("lastPing").toString()));
participant.setSessionId(participantMap.get("sessionId").toString());
participant.setNextcloudSessionId(participantMap.get("nextcloudSessionId").toString());

if (participantMap.get("userId") != null && !participantMap.get("userId").toString().isEmpty()) {
participant.setUserId(participantMap.get("userId").toString());
Expand Down
Loading