aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-08 21:13:24 +0100
committerlookshe <github@lookshe.org>2016-03-08 21:13:24 +0100
commit74d6d10cb76b7440f57db193a3c38e476206969c (patch)
tree665b7787c0f7bcb6d759e849972fa9658e84423f /src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
parent7be757de90fb71042b79b88a76cd36fc07b2ee87 (diff)
parentf051dd0bcdbd35d101420fb1f75f33a565a1e0f8 (diff)
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
index f8c624be..d3086d66 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
@@ -534,7 +534,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
mSearchEditText.append(mInitialJid);
filter(mInitialJid);
}
- return true;
+ return super.onCreateOptionsMenu(menu);
}
@Override
@@ -742,6 +742,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
Presence.Status s = p == null ? Presence.Status.OFFLINE : p.getStatus();
if (contact.showInRoster() && contact.match(needle)
&& (!this.mHideOfflineContacts
+ || (needle != null && !needle.trim().isEmpty())
|| s.compareTo(Presence.Status.OFFLINE) < 0)) {
this.contacts.add(contact);
}