diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2017-01-03 11:44:14 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2017-01-03 11:44:14 +0100 |
| commit | 470d244414ebacb743112bfb24ca28957e7dde93 (patch) | |
| tree | 3776c8a9344d40f3c9dc8cb3957be4ec479c0166 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | 2bb7bc1455e9bdcc9065d513fea58589f8179b10 (diff) | |
| parent | 5a670c88b081d3f9b8d33e37fd8d966f04c245fc (diff) | |
Merge branch 'feature-gboardgifs' of https://github.com/illegalprime/Conversations into illegalprime-feature-gboardgifs
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 8056139d..11fa76c2 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1560,6 +1560,10 @@ public class ConversationActivity extends XmppActivity }); } + public void attachImageToConversation(Uri uri) { + this.attachImageToConversation(getSelectedConversation(), uri); + } + private void attachImageToConversation(Conversation conversation, Uri uri) { if (conversation == null) { return; |