Commit 71ea97b0 authored by Grigory Fedorov's avatar Grigory Fedorov

Merge branch 'develop' into feature/chat_scroll

parents a0aa91a8 619bda43
Subproject commit fb78c5bce8c9cbbb7d09d9eb76a847a03b18b100
Subproject commit 295de3b53f054625ecdcf0d5a5db4fc846144013
......@@ -297,7 +297,7 @@ public class ContactListAdapter extends GroupedContactAdapter implements Runnabl
}
}
hasActiveChats = activeChats.getTotal() > 0;
hasActiveChats = activeChats != null && activeChats.getTotal() > 0;
// Remove empty groups, sort and apply structure.
baseEntities.clear();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment