show jids from address book in Start Conversation screen if only one account is used

1 files changed, 14 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 4e02df3ea..663905b7d 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -874,11 +874,13 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 
     protected void filterContacts(String needle) {
         this.contacts.clear();
-        for (Account account : xmppConnectionService.getAccounts()) {
+        final List<Account> accounts = xmppConnectionService.getAccounts();
+        final boolean singleAccountActive = isSingleAccountActive(accounts);
+        for (Account account : accounts) {
             if (account.getStatus() != Account.State.DISABLED) {
                 for (Contact contact : account.getRoster().getContacts()) {
                     Presence.Status s = contact.getShownStatus();
-                    if (contact.showInRoster() && contact.match(this, needle)
+                    if ((contact.showInRoster() || (singleAccountActive && contact.showInPhoneBook())) && contact.match(this, needle)
                             && (!this.mHideOfflineContacts
                             || (needle != null && !needle.trim().isEmpty())
                             || s.compareTo(Presence.Status.OFFLINE) < 0)) {
@@ -891,6 +893,16 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         mContactsAdapter.notifyDataSetChanged();
     }
 
+    private static boolean isSingleAccountActive(final List<Account> accounts) {
+        int i = 0;
+        for(Account account : accounts) {
+            if (account.getStatus() != Account.State.DISABLED) {
+                ++i;
+            }
+        }
+        return i == 1;
+    }
+
     protected void filterConferences(String needle) {
         this.conferences.clear();
         for (Account account : xmppConnectionService.getAccounts()) {