From fb9817091a8722782801a34b40e5baaceb777521 Mon Sep 17 00:00:00 2001 From: steckbrief Date: Mon, 26 Feb 2018 21:07:26 +0100 Subject: improves remote file status display and loading of remote files --- .../conversationsplus/ui/ConversationActivity.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java') diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java index 0167ef4b..69c1f817 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java @@ -46,7 +46,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import de.thedevstack.android.logcat.Logging; -import de.thedevstack.conversationsplus.entities.Presence; import de.thedevstack.conversationsplus.services.filetransfer.FileTransferManager; import de.thedevstack.conversationsplus.utils.AccountUtil; import de.thedevstack.conversationsplus.utils.UIHelper; @@ -149,7 +148,7 @@ public class ConversationActivity extends XmppActivity } @Override - protected String getShareableUri() { + public String getShareableUri() { Conversation conversation = getSelectedConversation(); if (conversation != null) { return conversation.getAccount().getShareableUri(); @@ -1251,12 +1250,12 @@ public class ConversationActivity extends XmppActivity Jid jid = getSelectedConversation().getJid(); try { Jid next = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), nick); - this.mConversationFragment.privateMessageWith(next); + this.privateMessageWith(next); } catch (final InvalidJidException ignored) { //do nothing } } else { - this.mConversationFragment.highlightInConference(nick); + this.highlightNickInConference(nick); } } else { this.mConversationFragment.appendText(text); @@ -1275,6 +1274,14 @@ public class ConversationActivity extends XmppActivity } } + public void privateMessageWith(Jid jid) { + this.mConversationFragment.privateMessageWith(jid); + } + + public void highlightNickInConference(String nick) { + this.mConversationFragment.highlightInConference(nick); + } + private boolean selectConversationByUuid(String uuid) { if (uuid == null) { return false; -- cgit v1.2.3