gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-15 07:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix hangup

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-02-07 12:07:28 +01:00
parent 9d1f62bd4d
commit 902a1c1885
1 changed files with 10 additions and 2 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

@ -409,7 +409,11 @@ public class CallActivity extends AppCompatActivity {
@OnClick(R.id.call_control_hangup) @OnClick(R.id.call_control_hangup)
public void onHangupClick() { public void onHangupClick() {
hangup(false); if (inCall) {
hangup(false);
} else {
hangup(true);
}
} }
@OnClick(R.id.call_control_camera) @OnClick(R.id.call_control_camera)
@ -1046,7 +1050,11 @@ public class CallActivity extends AppCompatActivity {
localAudioTrack = null; localAudioTrack = null;
localVideoTrack = null; localVideoTrack = null;
hangupNetworkCalls(); if (!dueToNetworkChange) {
hangupNetworkCalls();
} else {
finish();
}
} }
private void hangupNetworkCalls() { private void hangupNetworkCalls() {