Crash with disabled "Group by account" option fixed.

35f8f6e9 · Grigory Fedorov · 7ab382c8 · 35f8f6e9
Commit 35f8f6e9 authored Apr 13, 2015 by Grigory Fedorov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

GroupedContactAdapter.java .../com/xabber/android/ui/adapter/GroupedContactAdapter.java +7 -5

No files found.
--- a/app/src/main/java/com/xabber/android/ui/adapter/GroupedContactAdapter.java
+++ b/app/src/main/java/com/xabber/android/ui/adapter/GroupedContactAdapter.java
@@ -333,12 +333,14 @@ public abstract class GroupedContactAdapter extends BaseAdapter implements Updat
            color = accountSubgroupColors[level];
            viewHolder.groupOfflineIndicator.setVisibility(View.VISIBLE);
-            StatusMode statusMode = AccountManager.getInstance().getAccount(configuration.getAccount()).getDisplayStatusMode();
+            if (!configuration.getAccount().equalsIgnoreCase(GroupManager.NO_ACCOUNT)) {
+                StatusMode statusMode = AccountManager.getInstance().getAccount(configuration.getAccount()).getDisplayStatusMode();
-            if (statusMode == StatusMode.unavailable || statusMode == StatusMode.connection) {
+                if (statusMode == StatusMode.unavailable || statusMode == StatusMode.connection) {
-                viewHolder.offlineShadow.setVisibility(View.VISIBLE);
+                    viewHolder.offlineShadow.setVisibility(View.VISIBLE);
-            } else {
+                } else {
-                viewHolder.offlineShadow.setVisibility(View.GONE);
+                    viewHolder.offlineShadow.setVisibility(View.GONE);
+                }
            }
        }