Fix getColor crash

app/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java

@@ -91,8 +91,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
         }
 
         if (savedInstanceState == null) {
-            Integer color = gtasksList.getColor();
-            selectedTheme = color == null ? -1 : color;
+            selectedTheme = gtasksList.getColor();
         } else {
             selectedTheme = savedInstanceState.getInt(EXTRA_SELECTED_THEME);
         }

app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java

@@ -30,9 +30,7 @@ public class GtasksFilter extends Filter {
     public GtasksFilter(GoogleTaskList list) {
         super(list.getTitle(), getQueryTemplate(list), getValuesForNewTasks(list));
         storeId = list.getId();
-        if (list.hasColor()) {
-            tint = list.getColor();
-        }
+        tint = list.getColor();
         icon = CLOUD;
     }
 

app/src/main/java/org/tasks/data/GoogleTaskList.java

@@ -94,12 +94,8 @@ public class GoogleTaskList implements Parcelable {
         this.deleted = deleted;
     }
 
-    public boolean hasColor() {
-        return color != null;
-    }
-
     public Integer getColor() {
-        return color;
+        return color == null ? -1 : color;
     }
 
     public void setColor(Integer color) {
@@ -173,6 +169,6 @@ public class GoogleTaskList implements Parcelable {
         parcel.writeInt(remoteOrder);
         parcel.writeLong(lastSync);
         parcel.writeLong(deleted);
-        parcel.writeInt(color);
+        parcel.writeInt(getColor());
     }
 }