Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed various call related UI issues

Browse source
This commit is contained in:
Sylvain Berfini 2019-11-27 16:04:56 +01:00
parent 7192d09048
commit 165e9a8f76
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/linphone/call/CallActivity.java
View file

@ -388,6 +388,8 @@ public class CallActivity extends LinphoneGenericActivity
if (state == Call.State.End || state == Call.State.Released) { if (state == Call.State.End || state == Call.State.Released) {
if (core.getCallsNb() == 0) { if (core.getCallsNb() == 0) {
finish(); finish();
} else {
showVideoControls(false);
} }
} else if (state == Call.State.PausedByRemote) { } else if (state == Call.State.PausedByRemote) {
if (core.getCurrentCall() != null) { if (core.getCurrentCall() != null) {
@ -1092,7 +1094,7 @@ public class CallActivity extends LinphoneGenericActivity
mConferenceList.removeAllViews(); mConferenceList.removeAllViews();
for (Call call : mCore.getCalls()) { for (Call call : mCore.getCalls()) {
if (call.getConference() != null) { if (call != null && call.getConference() != null) {
if (mCore.isInConference()) { if (mCore.isInConference()) {
displayConferenceCall(call); displayConferenceCall(call);
conferenceDisplayed = true; conferenceDisplayed = true;
@ -1100,11 +1102,16 @@ public class CallActivity extends LinphoneGenericActivity
displayPausedConference(); displayPausedConference();
pausedConferenceDisplayed = true; pausedConferenceDisplayed = true;
} }
} else if (call != currentCall) { } else if (call != null && call != currentCall) {
Call.State state = call.getState();
if (state == Call.State.Paused
|| state == Call.State.PausedByRemote
|| state == Call.State.Pausing) {
displayPausedCall(call); displayPausedCall(call);
callThatIsNotCurrentFound = true; callThatIsNotCurrentFound = true;
} }
} }
}
mCallsList.setVisibility( mCallsList.setVisibility(
pausedConferenceDisplayed || callThatIsNotCurrentFound ? View.VISIBLE : View.GONE); pausedConferenceDisplayed || callThatIsNotCurrentFound ? View.VISIBLE : View.GONE);

2
app/src/main/java/org/linphone/call/CallOutgoingActivity.java
View file

@ -130,7 +130,7 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
// CallActivity.class)); // CallActivity.class));
} }
if (LinphoneManager.getCore().getCallsNb() == 0) { if (state == State.End || state == State.Released) {
finish(); finish();
} }
} }