From 754de6bb0449a577d2bb9c28cca6adf0ef9554f6 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Mon, 6 Feb 2017 10:01:13 +0100
Subject: relates FS#241: Implementation of http download based on okhttp

---
 .../java/de/thedevstack/conversationsplus/crypto/PgpEngine.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java
index c97b8395..440ca6de 100644
--- a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java
+++ b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java
@@ -16,6 +16,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.services.filetransfer.FileTransferManager;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
@@ -23,7 +24,6 @@ import de.thedevstack.conversationsplus.entities.Contact;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.Message;
-import de.thedevstack.conversationsplus.http.HttpConnectionManager;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.ui.UiCallback;
@@ -67,7 +67,10 @@ public class PgpEngine {
 										&& message.treatAsDownloadable() != Message.Decision.NEVER
                                         && (message.isHttpUploaded() || ConversationsPlusPreferences.autoDownloadFileLink())
 										&& ConversationsPlusPreferences.autoAcceptFileSize() > 0) {
-									HttpConnectionManager.createNewDownloadConnection(message);
+									FileTransferManager ftm = FileTransferManager.getInstance();
+									if (ftm.accept(message)) {
+										ftm.transferFile(message);
+									}
 								}
 								mXmppConnectionService.updateMessage(message);
 								callback.success(message);
-- 
cgit v1.2.3