From f3c7ad2648f346b313399d0ffa216bef391cf035 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 6 Apr 2019 09:30:41 -0500 Subject: [PATCH] Remove support_maps bool --- app/src/generic/res/values-v21/bools.xml | 4 ---- app/src/generic/res/values/bools.xml | 1 - app/src/googleplay/res/values/bools.xml | 1 - .../fragments/TaskEditControlSetFragmentManager.java | 10 ++-------- app/src/main/java/org/tasks/preferences/Device.java | 4 ---- 5 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 app/src/generic/res/values-v21/bools.xml diff --git a/app/src/generic/res/values-v21/bools.xml b/app/src/generic/res/values-v21/bools.xml deleted file mode 100644 index b7a44fba9..000000000 --- a/app/src/generic/res/values-v21/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - true - \ No newline at end of file diff --git a/app/src/generic/res/values/bools.xml b/app/src/generic/res/values/bools.xml index 9d507f477..30b01d340 100644 --- a/app/src/generic/res/values/bools.xml +++ b/app/src/generic/res/values/bools.xml @@ -1,5 +1,4 @@ - false false \ No newline at end of file diff --git a/app/src/googleplay/res/values/bools.xml b/app/src/googleplay/res/values/bools.xml index a583e9e13..ee92dd0ba 100644 --- a/app/src/googleplay/res/values/bools.xml +++ b/app/src/googleplay/res/values/bools.xml @@ -1,5 +1,4 @@ - true true \ No newline at end of file diff --git a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java index 68a496479..3f75b3d57 100644 --- a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java +++ b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import org.tasks.BuildConfig; import org.tasks.R; import org.tasks.injection.ForActivity; -import org.tasks.preferences.Device; import org.tasks.preferences.Preferences; import org.tasks.sync.SyncAdapters; import org.tasks.ui.CalendarControlSet; @@ -79,21 +78,16 @@ public class TaskEditControlSetFragmentManager { } private final Map controlSetFragments = new LinkedHashMap<>(); - private final Context context; private final List displayOrder; private final SyncAdapters syncAdapters; - private final Device device; private int numRows; @Inject public TaskEditControlSetFragmentManager( @ForActivity Context context, Preferences preferences, - SyncAdapters syncAdapters, - Device device) { - this.context = context; + SyncAdapters syncAdapters) { this.syncAdapters = syncAdapters; - this.device = device; displayOrder = BeastModePreferences.constructOrderedControlList(preferences, context); displayOrder.add(0, context.getString(EditTitleControlSet.TAG)); displayOrder.add(1, context.getString(CommentBarFragment.TAG)); @@ -162,7 +156,7 @@ public class TaskEditControlSetFragmentManager { case ReminderControlSet.TAG: return new ReminderControlSet(); case LocationControlSet.TAG: - return device.supportsMaps() ? new LocationControlSet() : null; + return new LocationControlSet(); case FilesControlSet.TAG: return new FilesControlSet(); case TimerControlSet.TAG: diff --git a/app/src/main/java/org/tasks/preferences/Device.java b/app/src/main/java/org/tasks/preferences/Device.java index ff4bd5542..9eea1095c 100644 --- a/app/src/main/java/org/tasks/preferences/Device.java +++ b/app/src/main/java/org/tasks/preferences/Device.java @@ -43,10 +43,6 @@ public class Device { return intent.resolveActivity(context.getPackageManager()) != null; } - public boolean supportsMaps() { - return context.getResources().getBoolean(R.bool.support_maps); - } - public boolean supportsGeofences() { return context.getResources().getBoolean(R.bool.support_geofences); }