From 3e21f9be4da2ef4a2c20d28271fc55ab60f5a6e6 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 18 Mar 2025 19:41:19 +0100 Subject: [PATCH] avoid crash in orphan info messages from webxdc --- .../org/thoughtcrime/securesms/ConversationFragment.java | 5 ++++- src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index 2d995b519..6c1f5fed2 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -747,7 +747,10 @@ public class ConversationFragment extends MessageSelectorFragment DozeReminder.dozeReminderTapped(getContext()); } else if(messageRecord.getInfoType() == DcMsg.DC_INFO_WEBXDC_INFO_MESSAGE) { - WebxdcActivity.openWebxdcActivity(getContext(), messageRecord.getParent(), messageRecord.getWebxdcHref()); + if (messageRecord.getParent() != null) { + // if the parent webxdc message still exists + WebxdcActivity.openWebxdcActivity(getContext(), messageRecord.getParent(), messageRecord.getWebxdcHref()); + } } else { String self_mail = dcContext.getConfig("configured_mail_user"); diff --git a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java index f22a6a2bc..76dbbedd0 100644 --- a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java @@ -106,7 +106,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE openWebxdcActivity(context, instance, ""); } - public static void openWebxdcActivity(Context context, DcMsg instance, String href) { + public static void openWebxdcActivity(Context context, @NonNull DcMsg instance, String href) { openWebxdcActivity(context, instance.getId(), false, href); }