From a444a96dc97153937212f291918d4c4152575924 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 12 Aug 2022 11:39:02 -0400
Subject: [PATCH] Fix drafts not loading in bubbled conversations.

---
 .../securesms/conversation/ConversationIntents.java             | 2 +-
 .../securesms/conversation/ConversationParentFragment.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
index 3bad3a663d..ae3fdcbd68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
@@ -85,7 +85,7 @@ public class ConversationIntents {
     return bundle;
   }
 
-  private static boolean isBubbleIntentUri(@Nullable Uri uri) {
+  static boolean isBubbleIntentUri(@Nullable Uri uri) {
     return uri != null && Objects.equals(uri.getAuthority(), BUBBLE_AUTHORITY);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 9c291e700a..3ceb2592bd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -1659,7 +1659,7 @@ public class ConversationParentFragment extends Fragment
       return setMedia(draftMedia, draftMediaType);
     }
 
-    if (draftText == null && draftMedia == null && draftMediaType == null) {
+    if (draftText == null && (draftMedia == null || ConversationIntents.isBubbleIntentUri(draftMedia)) && draftMediaType == null) {
       Log.d(TAG, "Initializing draft from database");
       return initializeDraftFromDatabase();
     } else {