aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-09 15:20:06 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-09 15:20:06 +0100
commitf65a2188cc8618ff155264ca0b85ed1a1dfa5491 (patch)
tree35cd4d707025252b36f5adcbc6af61545e4f03ec /src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
parent8c325dacf4be4028fbfdc1e175170237227c7e7e (diff)
parent53c7905631a9cee618157d15b06775c5d633f7a5 (diff)
Merge pull request #639 from SamWhited/issue631
Use JID class instead of strings
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
index f14da3524..aa6ed7b44 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
@@ -25,7 +25,7 @@ import eu.siacs.conversations.ui.adapter.ListItemAdapter;
public class ChooseContactActivity extends XmppActivity {
private ListView mListView;
- private ArrayList<ListItem> contacts = new ArrayList<ListItem>();
+ private ArrayList<ListItem> contacts = new ArrayList<>();
private ArrayAdapter<ListItem> mContactsAdapter;
private EditText mSearchEditText;
@@ -96,10 +96,10 @@ public class ChooseContactActivity extends XmppActivity {
Intent request = getIntent();
Intent data = new Intent();
ListItem mListItem = contacts.get(position);
- data.putExtra("contact", mListItem.getJid());
+ data.putExtra("contact", mListItem.getJid().toString());
String account = request.getStringExtra("account");
if (account == null && mListItem instanceof Contact) {
- account = ((Contact) mListItem).getAccount().getJid();
+ account = ((Contact) mListItem).getAccount().getJid().toString();
}
data.putExtra("account", account);
data.putExtra("conversation",