aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-06 14:33:13 -0500
committerSam Whited <sam@samwhited.com>2014-11-09 07:00:40 -0500
commitbf9207456e7523c2d18f1f9fa007542b5d0e10ea (patch)
tree3a2096ebb66e312d76a713a6b1c2ac9d59b20ef0 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
parentf15900426d4713b48eb96e0ad0b1cdda5a86becf (diff)
Update another chunk of stuff to use JID objects
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 8754b9537..299f06c05 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -54,6 +54,7 @@ import eu.siacs.conversations.ui.adapter.MessageAdapter;
import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureClicked;
import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureLongClicked;
import eu.siacs.conversations.utils.UIHelper;
+import eu.siacs.conversations.xmpp.jid.Jid;
public class ConversationFragment extends Fragment {
@@ -92,11 +93,9 @@ public class ConversationFragment extends Fragment {
}
};
protected ListView messagesView;
- protected LayoutInflater inflater;
- protected List<Message> messageList = new ArrayList<Message>();
+ protected List<Message> messageList = new ArrayList<>();
protected MessageAdapter messageListAdapter;
protected Contact contact;
- protected String queuedPqpMessage = null;
private EditMessage mEditMessage;
private ImageButton mSendButton;
private RelativeLayout snackbar;
@@ -147,7 +146,7 @@ public class ConversationFragment extends Fragment {
}
}
};
- private ConcurrentLinkedQueue<Message> mEncryptedMessages = new ConcurrentLinkedQueue<Message>();
+ private ConcurrentLinkedQueue<Message> mEncryptedMessages = new ConcurrentLinkedQueue<>();
private boolean mDecryptJobRunning = false;
private OnEditorActionListener mEditorActionListener = new OnEditorActionListener() {
@@ -281,10 +280,10 @@ public class ConversationFragment extends Fragment {
if (message.getStatus() <= Message.STATUS_RECEIVED) {
if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
if (message.getPresence() != null) {
- highlightInConference(message.getPresence());
+ highlightInConference(message.getPresence().toString());
} else {
highlightInConference(message
- .getCounterpart());
+ .getCounterpart().toString());
}
} else {
Contact contact = message.getConversation()
@@ -299,7 +298,7 @@ public class ConversationFragment extends Fragment {
} else {
Account account = message.getConversation().getAccount();
Intent intent = new Intent(activity, EditAccountActivity.class);
- intent.putExtra("jid", account.getJid());
+ intent.putExtra("jid", account.getJid().toString());
startActivity(intent);
}
}
@@ -430,9 +429,9 @@ public class ConversationFragment extends Fragment {
.createNewConnection(message);
}
- protected void privateMessageWith(String counterpart) {
+ protected void privateMessageWith(final Jid counterpart) {
this.mEditMessage.setText("");
- this.conversation.setNextPresence(counterpart);
+ this.conversation.setNextPresence(counterpart.toString());
updateChatMsgHint();
}