aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-05-09 21:10:11 +0200
committersteckbrief <steckbrief@chefmail.de>2016-05-09 21:10:11 +0200
commit2860088f0ea1cd5753756861c71cc7c118094f32 (patch)
tree6c6463253b830390c07932a28058b18a5da21acd /src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
parentbe448291caf329896de4bff55da416001c173bb9 (diff)
parent10e607ac51dcc42fa1b54bacb698beed43750de7 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index 9ad19522..7fcd6b33 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -23,6 +23,8 @@ import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
import de.thedevstack.conversationsplus.ui.listeners.ShareWithResizePictureUserDecisionListener;
+import de.thedevstack.conversationsplus.utils.ConversationUtil;
+
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account;
@@ -300,9 +302,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
@Override
public void onPresenceSelected() {
replaceToast(getString(R.string.preparing_file));
- ShareWithActivity.this.xmppConnectionService
- .attachFileToConversation(conversation, share.uris.get(0),
- attachFileCallback);
+ ConversationUtil.attachFileToConversation(conversation, share.uris.get(0), attachFileCallback);
switchToConversation(conversation, null, true);
finish();
}