Merge branch 'develop' into feature/chat_scroll

71ea97b0 · Grigory Fedorov · a0aa91a8 · 619bda43 · 295de3b5 · 71ea97b0
Commit 71ea97b0 authored Apr 20, 2015 by Grigory Fedorov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

otr4j app/otr4j +1 -1

ContactListAdapter.java ...ava/com/xabber/android/ui/adapter/ContactListAdapter.java +1 -1

No files found.
--- a/otr4j @ 295de3b5
+++ b/otr4j @ 295de3b5
-Subproject commit fb78c5bce8c9cbbb7d09d9eb76a847a03b18b100
+Subproject commit 295de3b53f054625ecdcf0d5a5db4fc846144013
--- a/app/src/main/java/com/xabber/android/ui/adapter/ContactListAdapter.java
+++ b/app/src/main/java/com/xabber/android/ui/adapter/ContactListAdapter.java
@@ -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();