From 733a7e2c9afb85cfb6f57a49a08112c56607f484 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 12 Jan 2018 23:28:13 -0600 Subject: [PATCH] Fix getColor crash --- .../tasks/activities/GoogleTaskListSettingsActivity.java | 3 +-- .../main/java/com/todoroo/astrid/api/GtasksFilter.java | 4 +--- app/src/main/java/org/tasks/data/GoogleTaskList.java | 8 ++------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java index 0a7196bbc..05954d7ba 100644 --- a/app/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java +++ b/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); } diff --git a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java index 6bf46595f..8745c59f0 100644 --- a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java +++ b/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; } diff --git a/app/src/main/java/org/tasks/data/GoogleTaskList.java b/app/src/main/java/org/tasks/data/GoogleTaskList.java index 022885f64..3d4789c2e 100644 --- a/app/src/main/java/org/tasks/data/GoogleTaskList.java +++ b/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()); } }