From 95521e80c1c029b02eddf5799cd23d0268ae4a1c Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 2 Apr 2018 21:45:19 +0200
Subject: fixed duplicate file sending

---
 src/main/java/de/pixart/messenger/ui/ShareWithActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui')

diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
index ad0ed109d..cbd2ca0eb 100644
--- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
@@ -84,7 +84,6 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
 
         @Override
         public void success(final Message message) {
-            xmppConnectionService.sendMessage(message);
             runOnUiThread(() -> {
                 if (attachmentCounter.decrementAndGet() <= 0) {
                     int resId;
@@ -366,6 +365,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
         } else {
             if (mReturnToPrevious && this.share.text != null && !this.share.text.isEmpty()) {
                 final PresenceSelector.OnPresenceSelected callback = new PresenceSelector.OnPresenceSelected() {
+
                     private void finishAndSend(Message message) {
                         replaceToast(getString(R.string.shared_text_with_x, conversation.getName()));
                         finish();
@@ -374,7 +374,6 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
                     private UiCallback<Message> messageEncryptionCallback = new UiCallback<Message>() {
                         @Override
                         public void success(final Message message) {
-                            message.setEncryption(Message.ENCRYPTION_DECRYPTED);
                             runOnUiThread(() -> finishAndSend(message));
                         }
 
-- 
cgit v1.2.3