diff --git a/app/build.gradle b/app/build.gradle index 66d5829e3..47431b267 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { versionCode 539 versionName "6.1.3" targetSdkVersion 28 - minSdkVersion 15 + minSdkVersion 16 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0617e395a..3a16b62eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ package="org.tasks"> - + diff --git a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index f83284ac7..7ba234088 100644 --- a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -183,10 +183,6 @@ public class AndroidUtilities { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1; } - public static boolean atLeastJellybean() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN; - } - public static boolean atLeastKitKat() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; } diff --git a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java index 461023bf8..77390d8f8 100644 --- a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java @@ -5,7 +5,6 @@ */ package com.todoroo.astrid.reminders; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybean; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastMarshmallow; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo; import static com.todoroo.andlib.utility.AndroidUtilities.preOreo; @@ -115,7 +114,6 @@ public class ReminderPreferences extends InjectingPreferenceActivity { requires(atLeastMarshmallow(), R.string.battery_optimization_settings); requires( preOreo(), R.string.p_rmd_ringtone, R.string.p_rmd_vibrate, R.string.p_led_notification); - requires(atLeastJellybean(), R.string.p_bundle_notifications); } @TargetApi(Build.VERSION_CODES.O) diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java index b4da5ae70..32342b9ad 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.java +++ b/app/src/main/java/org/tasks/preferences/Preferences.java @@ -3,7 +3,6 @@ package org.tasks.preferences; import static android.content.SharedPreferences.Editor; import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Sets.newHashSet; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybean; import static java.util.Collections.emptySet; import android.content.Context; @@ -438,7 +437,7 @@ public class Preferences { } public boolean bundleNotifications() { - return atLeastJellybean() && getBoolean(R.string.p_bundle_notifications, true); + return getBoolean(R.string.p_bundle_notifications, true); } public boolean usePersistentReminders() {