From 694321d38a704a4629a88540d107721724c858fa Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 19 Mar 2020 15:55:55 -0500 Subject: [PATCH] Fix generic compile --- .../java/org/tasks/location/GeofenceApi.java | 16 ++++++---------- .../java/org/tasks/location/GeofenceApi.java | 11 +++-------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/app/src/generic/java/org/tasks/location/GeofenceApi.java b/app/src/generic/java/org/tasks/location/GeofenceApi.java index 983a684ad..7fab54d75 100644 --- a/app/src/generic/java/org/tasks/location/GeofenceApi.java +++ b/app/src/generic/java/org/tasks/location/GeofenceApi.java @@ -1,8 +1,8 @@ package org.tasks.location; -import java.util.List; import javax.inject.Inject; -import org.tasks.data.Location; +import org.jetbrains.annotations.Nullable; +import org.tasks.data.Place; @SuppressWarnings("EmptyMethod") public class GeofenceApi { @@ -10,15 +10,11 @@ public class GeofenceApi { @Inject public GeofenceApi() {} - public void register(Location location) {} - - public void register(List activeGeofences) {} - - public void cancel(Location geofence) {} - public void registerAll() {} - public void cancel(long taskId) {} + public void update(@Nullable Place place) {} + + public void update(String place) {} - public void register(long taskId) {} + public void update(long taskId) {} } diff --git a/app/src/googleplay/java/org/tasks/location/GeofenceApi.java b/app/src/googleplay/java/org/tasks/location/GeofenceApi.java index b50904827..47635a257 100644 --- a/app/src/googleplay/java/org/tasks/location/GeofenceApi.java +++ b/app/src/googleplay/java/org/tasks/location/GeofenceApi.java @@ -11,7 +11,6 @@ import com.google.android.gms.location.GeofencingRequest; import com.google.android.gms.location.GeofencingRequest.Builder; import com.google.android.gms.location.LocationServices; import com.google.common.collect.ImmutableList; -import java.util.List; import javax.inject.Inject; import org.tasks.data.LocationDao; import org.tasks.data.MergedGeofence; @@ -37,7 +36,9 @@ public class GeofenceApi { } public void registerAll() { - update(locationDao.getPlacesWithGeofences()); + for (Place place : locationDao.getPlacesWithGeofences()) { + update(place); + } } public void update(long taskId) { @@ -48,12 +49,6 @@ public class GeofenceApi { update(locationDao.getPlace(place)); } - private void update(List places) { - for (Place place : places) { - update(place); - } - } - public void update(@Nullable Place place) { if (place == null || !permissionChecker.canAccessLocation()) { return;