diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java index 14beef2cb76da5946b80a6eafe53effabcdb5487..5ad3e49f69af71cb65e8365e1d0ea5bd672bae2e 100644 --- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java @@ -414,6 +414,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe } else if (asList(ACTION_MAKE_VIDEO_CALL, ACTION_MAKE_VOICE_CALL).contains(action)) { proposeJingleRtpSession(account, with, actionToMedia(action)); binding.with.setText(account.getRoster().getContact(with).getDisplayName()); + binding.withJid.setText(with.asBareJid()); } else { throw new IllegalStateException("received onNewIntent without sessionId"); } @@ -438,6 +439,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe } else if (asList(ACTION_MAKE_VIDEO_CALL, ACTION_MAKE_VOICE_CALL).contains(action)) { proposeJingleRtpSession(account, with, actionToMedia(action)); binding.with.setText(account.getRoster().getContact(with).getDisplayName()); + binding.withJid.setText(with.asBareJid()); } else if (Intent.ACTION_VIEW.equals(action)) { final String extraLastState = intent.getStringExtra(EXTRA_LAST_REPORTED_STATE); final RtpEndUserState state = extraLastState == null ? null : RtpEndUserState.valueOf(extraLastState); @@ -450,6 +452,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe invalidateOptionsMenu(); } binding.with.setText(account.getRoster().getContact(with).getDisplayName()); + binding.withJid.setText(with.asBareJid()); if (xmppConnectionService.getJingleConnectionManager().fireJingleRtpConnectionStateUpdates()) { return; } @@ -627,6 +630,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe putScreenInCallMode(); } binding.with.setText(getWith().getDisplayName()); + binding.withJid.setText(with.asBareJid()); updateVideoViews(currentState); updateStateDisplay(currentState, media); updateVerifiedShield(verified && STATES_SHOWING_SWITCH_TO_CHAT.contains(currentState)); @@ -651,6 +655,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe updateVerifiedShield(false); invalidateOptionsMenu(); binding.with.setText(account.getRoster().getContact(with).getDisplayName()); + binding.withJid.setText(with.asBareJid()); } private void reInitializeActivityWithRunningRtpSession(final Account account, Jid with, String sessionId) { diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml index 5c32dd94c01c2f7099b373b388331fef589e4b56..c171d739e56e2e92ac97c9393bd37bb4538f84a0 100644 --- a/src/main/res/layout/activity_rtp_session.xml +++ b/src/main/res/layout/activity_rtp_session.xml @@ -55,11 +55,24 @@ android:layout_marginLeft="16dp" android:layout_marginTop="0dp" android:layout_marginRight="16dp" - android:layout_marginBottom="32dp" + android:layout_marginBottom="16dp" android:textAppearance="@style/TextAppearance.Conversations.Display2" android:textColor="@color/white" tools:text="Juliet Capulet" /> + +