yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-06 03:49:58 +02:00
Code Issues Releases Wiki Activity

avoid crash in orphan info messages from webxdc

Browse source
This commit is contained in:
adbenitez 2025-03-18 19:41:19 +01:00
parent ad1159c05c
commit 3e21f9be4d
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
View file

@ -747,8 +747,11 @@ public class ConversationFragment extends MessageSelectorFragment
DozeReminder.dozeReminderTapped(getContext()); DozeReminder.dozeReminderTapped(getContext());
} }
else if(messageRecord.getInfoType() == DcMsg.DC_INFO_WEBXDC_INFO_MESSAGE) { else if(messageRecord.getInfoType() == DcMsg.DC_INFO_WEBXDC_INFO_MESSAGE) {
if (messageRecord.getParent() != null) {
// if the parent webxdc message still exists
WebxdcActivity.openWebxdcActivity(getContext(), messageRecord.getParent(), messageRecord.getWebxdcHref()); WebxdcActivity.openWebxdcActivity(getContext(), messageRecord.getParent(), messageRecord.getWebxdcHref());
} }
}
else { else {
String self_mail = dcContext.getConfig("configured_mail_user"); String self_mail = dcContext.getConfig("configured_mail_user");
if (self_mail != null && !self_mail.isEmpty() if (self_mail != null && !self_mail.isEmpty()

2
src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
View file

@ -106,7 +106,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
openWebxdcActivity(context, instance, ""); 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); openWebxdcActivity(context, instance.getId(), false, href);
} }