From 51a443a1849bd17ab24e7908a476694128c6fc22 Mon Sep 17 00:00:00 2001
From: Hocuri <hocceruser-github@gmx.de>
Date: Fri, 24 Apr 2020 10:17:40 +0200
Subject: [PATCH] Fix #1305 An object (image), "shared" to Delta Chat once,
 appears again forever in Chat editors until app is closed

The problem was that the intent still had the share flag and data.

A draft is now initialized (and stays) so that the user can return to sending later.
---
 src/org/thoughtcrime/securesms/ConversationActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 5eaab893b..436324de2 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -548,9 +548,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     if (isRelayingMessageContent(this)) {
       if (isSharing(this)) {
-        dcContext.setDraft(dcChat.getId(), null);
         attachmentManager.cleanup();
-        composeText.setText("");
       }
       finish();
       return;
@@ -662,6 +660,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void handleSharing() {
     ArrayList<Uri> uriList =  RelayUtil.getSharedUris(this);
+    RelayUtil.resetRelayingMessageContent(this); // This avoids that the shared text appears again if another chat is opened
     if (uriList == null) return;
     if (uriList.size() > 1) {
       String message = String.format(getString(R.string.share_multiple_attachments), uriList.size());