conversation: handle ongoing call pane

> Return to call pane would display whilst call has not yet initialized

Change-Id: I5b0f6702742ddede7629656806d425dcc4f7976e

ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java

@@ -136,6 +136,7 @@ public class ConversationPresenter extends RootPresenter<ConversationView> {
                 .firstOrError()
                 .subscribe(conversation -> {
                     conversation.setVisible(true);
+                    updateOngoingCallView();
                     mConversationFacade.readMessages(mAccountService.getAccount(mAccountId), conversation);
                 }));
     }
@@ -307,7 +308,7 @@ public class ConversationPresenter extends RootPresenter<ConversationView> {
 
     private void updateOngoingCallView() {
         Conference conf = mConversation.getCurrentCall();
-        if (conf != null && conf.getState() != SipCall.State.INACTIVE) {
+        if (conf != null && (conf.getState() == SipCall.State.CURRENT || conf.getState() == SipCall.State.HOLD || conf.getState() == SipCall.State.RINGING)) {
             getView().displayOnGoingCallPane(true);
         } else {
             getView().displayOnGoingCallPane(false);