mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-27 08:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2388 from nextcloud/fix-issues-when-leaving-calls

Browse source 
Fix issues when leaving calls
This commit is contained in:
Tim Krüger 2022-09-19 10:25:38 +02:00 committed by GitHub
commit 615e67296d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View file

@ -396,7 +396,6 @@ public class CallActivity extends CallBaseActivity {
binding.cameraButton.setOnClickListener(l -> onCameraClick());
binding.hangupButton.setOnClickListener(l -> {
setCallState(CallStatus.LEAVING);
hangup(true);
});
@ -1167,7 +1166,6 @@ public class CallActivity extends CallBaseActivity {
@Override
public void onDestroy() {
if (!currentCallStatus.equals(CallStatus.LEAVING)) {
setCallState(CallStatus.LEAVING);
hangup(true);
}
powerManagerUtils.updatePhoneState(PowerManagerUtils.PhoneState.IDLE);
@ -1485,6 +1483,10 @@ public class CallActivity extends CallBaseActivity {
@Subscribe(threadMode = ThreadMode.BACKGROUND)
public void onMessageEvent(WebSocketCommunicationEvent webSocketCommunicationEvent) {
if (CallStatus.LEAVING.equals(currentCallStatus)) {
return;
}
switch (webSocketCommunicationEvent.getType()) {
case "hello":
Log.d(TAG, "onMessageEvent 'hello'");
@ -1660,6 +1662,9 @@ public class CallActivity extends CallBaseActivity {
private void hangup(boolean shutDownView) {
Log.d(TAG, "hangup! shutDownView=" + shutDownView);
if (shutDownView) {
setCallState(CallStatus.LEAVING);
}
stopCallingSound();
dispose(null);
@ -1801,7 +1806,7 @@ public class CallActivity extends CallBaseActivity {
}
} else {
Log.d(TAG, " inCallFlag of currentSessionId: " + inCallFlag);
if (inCallFlag == 0) {
if (inCallFlag == 0 && !CallStatus.LEAVING.equals(currentCallStatus) && ApplicationWideCurrentRoomHolder.getInstance().isInCall()) {
Log.d(TAG, "Most probably a moderator ended the call for all.");
hangup(true);
}