Don't look up alarms for new tasks

bmaehr · Apr 12, 2018 · b7c6d88 · b7c6d88
1 parent 16a1c00
commit b7c6d88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -6,8 +6,11 @@
 package com.todoroo.astrid.ui;
 
 import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Lists.transform;
 import static com.google.common.collect.Sets.newHashSet;
 import static com.todoroo.andlib.utility.DateUtilities.getLongDateStringWithTime;
+import static com.todoroo.astrid.data.Task.NO_ID;
+import static java.util.Collections.emptyList;
 import static org.tasks.PermissionUtil.verifyPermissions;
 import static org.tasks.date.DateTimeUtils.newDateTime;
 
@@ -140,11 +143,9 @@ public View onCreateView(
   }
 
   private List<Long> currentAlarms() {
-    final List<Long> alarms = new ArrayList<>();
-    for (Alarm entry : alarmService.getAlarms(taskId)) {
-      alarms.add(entry.getTime());
-    }
-    return alarms;
+    return taskId == NO_ID
+        ? emptyList()
+        : transform(alarmService.getAlarms(taskId), Alarm::getTime);
   }
 
   @OnItemSelected(R.id.alarms_add_spinner)

diff --git a/app/src/main/java/org/tasks/location/GeofenceService.java b/app/src/main/java/org/tasks/location/GeofenceService.java
@@ -1,6 +1,8 @@
 package org.tasks.location;
 
 import static com.google.common.collect.Lists.newArrayList;
+import static com.todoroo.astrid.data.Task.NO_ID;
+import static java.util.Collections.emptyList;
 
 import java.util.List;
 import java.util.Set;
@@ -20,7 +22,7 @@ public GeofenceService(GeofenceApi geofenceApi, LocationDao locationDao) {
   }
 
   public List<Location> getGeofences(long taskId) {
-    return locationDao.getGeofences(taskId);
+    return taskId == NO_ID ? emptyList() : locationDao.getGeofences(taskId);
   }
 
   public void setupGeofences() {