From b7c6d8823c3b2059cd57a91511eaa097fcfa28d0 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 12 Apr 2018 06:10:34 -0500
Subject: [PATCH] Don't look up alarms for new tasks

---
 .../com/todoroo/astrid/ui/ReminderControlSet.java     | 11 ++++++-----
 .../main/java/org/tasks/location/GeofenceService.java |  4 +++-
 2 files changed, 9 insertions(+), 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
index 871d74813..b20854796 100644
--- 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 class ReminderControlSet extends TaskEditControlFragment {
   }
 
   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
index 50d0aa464..130146acb 100644
--- 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 class GeofenceService {
   }
 
   public List<Location> getGeofences(long taskId) {
-    return locationDao.getGeofences(taskId);
+    return taskId == NO_ID ? emptyList() : locationDao.getGeofences(taskId);
   }
 
   public void setupGeofences() {