diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-08-22 08:55:37 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-08-22 08:55:37 +0200 |
| commit | 77d0c1110a8ae7a980f1c4420d719af803990da8 (patch) | |
| tree | 20d3ce434f3c6d740141727d4c143ea5f027a646 /src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java | |
| parent | 97100834a5bcb08f2fdf2eb6c580d3ceeb8b6b2f (diff) | |
| parent | f45ad10b1baaf09fd4a40d6b63d1cd093623eedc (diff) | |
Merge remote-tracking branch 'remotes/origin/filetransfer'
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java index de69c1e6..99d26b64 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java @@ -45,6 +45,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; +import de.thedevstack.conversationsplus.http.HttpConnectionManager; import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog; import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener; import de.thedevstack.conversationsplus.utils.ConversationUtil; @@ -620,7 +621,7 @@ public class ConversationActivity extends XmppActivity Toast.makeText(this, R.string.not_connected_try_again, Toast.LENGTH_SHORT).show(); } } else if (message.treatAsDownloadable() != Message.Decision.NEVER) { - xmppConnectionService.getHttpConnectionManager().createNewDownloadConnection(message, true); + HttpConnectionManager.createNewDownloadConnection(message, true); } } |