diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-05-13 11:23:45 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-05-13 11:23:45 +0200 |
commit | 351db27a77c200e526b86c318213b72cd65d1b7b (patch) | |
tree | 7802de24b0666d1a28ecffec0280d74173642d2b /src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java | |
parent | 70938a31a0e78203449d769fa5bda15ce73d1ed4 (diff) | |
parent | 10e607ac51dcc42fa1b54bacb698beed43750de7 (diff) |
Merge branch 'master' into message_display_rework
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java index e46095e7..7138f8e3 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java @@ -52,6 +52,7 @@ import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import de.thedevstack.conversationsplus.services.AvatarService; import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog; import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener; +import de.thedevstack.conversationsplus.utils.ConversationUtil; import de.timroes.android.listview.EnhancedListView; import de.thedevstack.conversationsplus.Config; import de.thedevstack.conversationsplus.R; @@ -1483,7 +1484,7 @@ public class ConversationActivity extends XmppActivity if (conversation == null) { return; } - xmppConnectionService.attachLocationToConversation(conversation,uri, new UiCallback<Message>() { + ConversationUtil.attachLocationToConversation(conversation,uri, new UiCallback<Message>() { @Override public void success(Message message) { @@ -1508,7 +1509,7 @@ public class ConversationActivity extends XmppActivity } final Toast prepareFileToast = Toast.makeText(getApplicationContext(),getText(R.string.preparing_file), Toast.LENGTH_LONG); prepareFileToast.show(); - xmppConnectionService.attachFileToConversation(conversation, uri, new UiCallback<Message>() { + ConversationUtil.attachFileToConversation(conversation, uri, new UiCallback<Message>() { @Override public void success(Message message) { hidePrepareFileToast(prepareFileToast); |