From 37c5e4346e1672ffb555136ac1ef7e3c7d15fe3a Mon Sep 17 00:00:00 2001 From: Phillip Davis Date: Mon, 24 Nov 2025 15:20:08 -0500 Subject: [PATCH] use synchronously initialized activity fixes NPE when using 'Return to ongoing call' context button --- .../eu/siacs/conversations/ui/ConversationFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index e31fb338e79129aba47faffb41afef482f05601d..57e652901f5892009d8dccab019f9447423143bb 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -2345,7 +2345,7 @@ public class ConversationFragment extends XmppFragment .getOngoingRtpConnection(conversation.getContact()); if (ongoingRtpSession.isPresent()) { final OngoingRtpSession id = ongoingRtpSession.get(); - final Intent intent = new Intent(getActivity(), RtpSessionActivity.class); + final Intent intent = new Intent(activity, RtpSessionActivity.class); intent.setAction(Intent.ACTION_VIEW); intent.putExtra( RtpSessionActivity.EXTRA_ACCOUNT, @@ -2353,7 +2353,7 @@ public class ConversationFragment extends XmppFragment intent.putExtra(RtpSessionActivity.EXTRA_WITH, id.getWith().toString()); if (id instanceof AbstractJingleConnection) { intent.putExtra(RtpSessionActivity.EXTRA_SESSION_ID, id.getSessionId()); - startActivity(intent); + activity.startActivity(intent); } else if (id instanceof JingleConnectionManager.RtpSessionProposal proposal) { if (Media.audioOnly(proposal.media)) { intent.putExtra( @@ -2365,7 +2365,7 @@ public class ConversationFragment extends XmppFragment RtpSessionActivity.ACTION_MAKE_VIDEO_CALL); } intent.putExtra(RtpSessionActivity.EXTRA_PROPOSED_SESSION_ID, proposal.sessionId); - startActivity(intent); + activity.startActivity(intent); } } }