safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java

@@ -687,7 +687,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // change check image for selected value
         VehiclesGridViewAdapter.ViewHolder viewLive = (VehiclesGridViewAdapter.ViewHolder) view.getTag();
 
-        if (displayedVehicles.get(position))
+        if (Boolean.TRUE.equals(displayedVehicles.get(position)))
             viewLive.imgViewChecked.setImageResource(R.drawable.checked);
         else
             viewLive.imgViewChecked.setImageResource(R.drawable.unchecked);
@@ -695,16 +695,16 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // check if all values are identical
         boolean identical = true;
         for (Boolean displ : displayedVehicles)
-            if (displ != displayedVehicles.get(0)) {
+            if (!Objects.equals(displ, displayedVehicles.get(0))) {
                 identical = false;
                 break;
             }
 
         // change image when all values are identical
-        if (identical && displayedVehicles.get(0)) {
+        if (identical && Boolean.TRUE.equals(displayedVehicles.get(0))) {
             imageViewCheckAll.setSelected(true);
             imageViewCheckAll.setBackgroundResource(R.drawable.check_all);
-        } else {
+        } else if (identical && Boolean.TRUE.equals(!displayedVehicles.get(0))) {
             imageViewCheckAll.setSelected(false);
             imageViewCheckAll.setBackgroundResource(R.drawable.uncheck_all);
         }