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 59c41183a..0dde045e1 100644 --- a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -17,10 +17,13 @@ import android.util.DisplayMetrics; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.TextView; + +import org.tasks.BuildConfig; + import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.tasks.BuildConfig; + import timber.log.Timber; /** @@ -140,10 +143,6 @@ public class AndroidUtilities { return !atLeastOreo(); } - public static boolean atLeastNougat() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N; - } - public static boolean atLeastNougatMR1() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1; } diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt index b94089ed3..25d03c5f1 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt @@ -17,7 +17,6 @@ import androidx.appcompat.view.ActionMode import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener import androidx.lifecycle.lifecycleScope import com.todoroo.andlib.utility.AndroidUtilities -import com.todoroo.andlib.utility.AndroidUtilities.atLeastNougat import com.todoroo.astrid.activity.TaskEditFragment.Companion.newTaskEditFragment import com.todoroo.astrid.activity.TaskListFragment.TaskListFragmentCallbackHandler import com.todoroo.astrid.api.Filter @@ -104,13 +103,7 @@ class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandl public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { when (requestCode) { - NavigationDrawerFragment.REQUEST_SETTINGS -> - if (atLeastNougat()) { - recreate() - } else { - finish() - startActivity(getTaskListIntent(this, filter)) - } + NavigationDrawerFragment.REQUEST_SETTINGS -> recreate() NavigationDrawerFragment.REQUEST_NEW_LIST -> if (resultCode == RESULT_OK) { data diff --git a/app/src/main/java/org/tasks/jobs/SyncWork.kt b/app/src/main/java/org/tasks/jobs/SyncWork.kt index ad60f8cea..1b0d0706f 100644 --- a/app/src/main/java/org/tasks/jobs/SyncWork.kt +++ b/app/src/main/java/org/tasks/jobs/SyncWork.kt @@ -5,7 +5,6 @@ import android.net.ConnectivityManager import androidx.core.content.ContextCompat.getSystemService import androidx.core.net.ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_ENABLED import androidx.work.WorkerParameters -import com.todoroo.andlib.utility.AndroidUtilities.atLeastNougat import org.tasks.LocalBroadcastManager import org.tasks.analytics.Firebase import org.tasks.injection.BaseWorker @@ -23,7 +22,7 @@ abstract class SyncWork constructor( if (!enabled()) { return Result.failure() } - if (atLeastNougat() && isBackground) { + if (isBackground) { getSystemService(context, ConnectivityManager::class.java)?.apply { if (restrictBackgroundStatus == RESTRICT_BACKGROUND_STATUS_ENABLED) { return Result.failure() diff --git a/app/src/main/java/org/tasks/notifications/NotificationManager.kt b/app/src/main/java/org/tasks/notifications/NotificationManager.kt index 8611f019a..0d0a68406 100644 --- a/app/src/main/java/org/tasks/notifications/NotificationManager.kt +++ b/app/src/main/java/org/tasks/notifications/NotificationManager.kt @@ -120,7 +120,7 @@ class NotificationManager @Inject constructor( fiveTimes = false, useGroupKey = true) } - if (AndroidUtilities.atLeastNougat() && newNotifications.size == 1) { + if (newNotifications.size == 1) { createNotifications(newNotifications, alert, nonstop, fiveTimes, true) } else { createNotifications( @@ -151,8 +151,7 @@ class NotificationManager @Inject constructor( notificationDao.delete(notification.taskId) } else { builder - .setGroup( - if (useGroupKey) GROUP_KEY else if (AndroidUtilities.atLeastNougat()) notification.taskId.toString() else null) + .setGroup(if (useGroupKey) GROUP_KEY else notification.taskId.toString()) .setGroupAlertBehavior( if (alert) NotificationCompat.GROUP_ALERT_CHILDREN else NotificationCompat.GROUP_ALERT_SUMMARY) notify(notification.taskId, builder, alert, nonstop, fiveTimes) diff --git a/app/src/main/java/org/tasks/widget/TileService.kt b/app/src/main/java/org/tasks/widget/TileService.kt index 62790a825..1a3daf10b 100644 --- a/app/src/main/java/org/tasks/widget/TileService.kt +++ b/app/src/main/java/org/tasks/widget/TileService.kt @@ -1,11 +1,8 @@ package org.tasks.widget -import android.os.Build.VERSION_CODES import android.service.quicksettings.TileService -import androidx.annotation.RequiresApi import org.tasks.intents.TaskIntents -@RequiresApi(api = VERSION_CODES.N) class TileService : TileService() { override fun onClick() { val newTaskIntent = TaskIntents.getNewTaskIntent(this, null) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index dfae7e28e..c7cde8c94 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val kotlin = "1.4.30" const val targetSdk = 30 - const val minSdk = 23 + const val minSdk = 24 const val butterknife = "10.2.3" const val work = "2.5.0" const val leakcanary = "2.6"