From 165e9a8f7669024401441189319a3a747407e8ad Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 27 Nov 2019 16:04:56 +0100
Subject: [PATCH] Fixed various call related UI issues

---
 .../main/java/org/linphone/call/CallActivity.java | 15 +++++++++++----
 .../org/linphone/call/CallOutgoingActivity.java   |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java
index f2948d69b..c3fdf5b65 100644
--- a/app/src/main/java/org/linphone/call/CallActivity.java
+++ b/app/src/main/java/org/linphone/call/CallActivity.java
@@ -388,6 +388,8 @@ public class CallActivity extends LinphoneGenericActivity
                         if (state == Call.State.End || state == Call.State.Released) {
                             if (core.getCallsNb() == 0) {
                                 finish();
+                            } else {
+                                showVideoControls(false);
                             }
                         } else if (state == Call.State.PausedByRemote) {
                             if (core.getCurrentCall() != null) {
@@ -1092,7 +1094,7 @@ public class CallActivity extends LinphoneGenericActivity
         mConferenceList.removeAllViews();
 
         for (Call call : mCore.getCalls()) {
-            if (call.getConference() != null) {
+            if (call != null && call.getConference() != null) {
                 if (mCore.isInConference()) {
                     displayConferenceCall(call);
                     conferenceDisplayed = true;
@@ -1100,9 +1102,14 @@ public class CallActivity extends LinphoneGenericActivity
                     displayPausedConference();
                     pausedConferenceDisplayed = true;
                 }
-            } else if (call != currentCall) {
-                displayPausedCall(call);
-                callThatIsNotCurrentFound = true;
+            } 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);
+                    callThatIsNotCurrentFound = true;
+                }
             }
         }
 
diff --git a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
index 0bc10864e..d538de46d 100644
--- a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
@@ -130,7 +130,7 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
                             // CallActivity.class));
                         }
 
-                        if (LinphoneManager.getCore().getCallsNb() == 0) {
+                        if (state == State.End || state == State.Released) {
                             finish();
                         }
                     }