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

Fix #579

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-05 12:03:21 +02:00
parent 4697e4f340
commit 69c4435b1e
1 changed files with 78 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -878,7 +878,9 @@ public class CallController extends BaseController {
@Override @Override
public void onDestroy() { public void onDestroy() {
if (!currentCallStatus.equals(CallStatus.LEAVING)) {
onHangupClick(); onHangupClick();
}
powerManagerUtils.updatePhoneState(PowerManagerUtils.PhoneState.IDLE); powerManagerUtils.updatePhoneState(PowerManagerUtils.PhoneState.IDLE);
super.onDestroy(); super.onDestroy();
} }
@ -1074,6 +1076,7 @@ public class CallController extends BaseController {
@Override @Override
public void onNext(GenericOverall genericOverall) { public void onNext(GenericOverall genericOverall) {
if (!currentCallStatus.equals(CallStatus.LEAVING)) {
setCallState(CallStatus.ESTABLISHED); setCallState(CallStatus.ESTABLISHED);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true); ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
@ -1161,6 +1164,7 @@ public class CallController extends BaseController {
} }
} }
}
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
@ -1331,6 +1335,7 @@ public class CallController extends BaseController {
private void hangup(boolean shutDownView) { private void hangup(boolean shutDownView) {
stopCallingSound(); stopCallingSound();
dispose(null); dispose(null);
if (shutDownView) { if (shutDownView) {
if (videoCapturer != null) { if (videoCapturer != null) {
@ -2261,20 +2266,20 @@ public class CallController extends BaseController {
handler.removeCallbacksAndMessages(null); handler.removeCallbacksAndMessages(null);
} }
if (!hasMCU) { /*if (!hasMCU) {
setCallState(CallStatus.RECONNECTING); setCallState(CallStatus.RECONNECTING);
hangupNetworkCalls(false); hangupNetworkCalls(false);
} }*/
} else if (networkEvent.getNetworkConnectionEvent().equals(NetworkEvent.NetworkConnectionEvent.NETWORK_DISCONNECTED)) { } else if (networkEvent.getNetworkConnectionEvent().equals(NetworkEvent.NetworkConnectionEvent.NETWORK_DISCONNECTED)) {
if (handler != null) { if (handler != null) {
handler.removeCallbacksAndMessages(null); handler.removeCallbacksAndMessages(null);
} }
if (!hasMCU) { /* if (!hasMCU) {
setCallState(CallStatus.OFFLINE); setCallState(CallStatus.OFFLINE);
hangup(false); hangup(false);
} }*/
} }
} }
} }