Disable persistent reminders on Android 14+

pull/2297/head
Alex Baker 1 year ago
parent 47c425f7e8
commit 585f12d2f9

@ -147,6 +147,10 @@ public class AndroidUtilities {
return VERSION.SDK_INT < VERSION_CODES.TIRAMISU; return VERSION.SDK_INT < VERSION_CODES.TIRAMISU;
} }
public static boolean preUpsideDownCake() {
return VERSION.SDK_INT <= VERSION_CODES.TIRAMISU;
}
public static boolean atLeastNougatMR1() { public static boolean atLeastNougatMR1() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1; return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1;
} }

@ -13,6 +13,7 @@ import androidx.core.app.NotificationCompat
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.documentfile.provider.DocumentFile import androidx.documentfile.provider.DocumentFile
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.todoroo.andlib.utility.AndroidUtilities
import com.todoroo.andlib.utility.DateUtilities import com.todoroo.andlib.utility.DateUtilities
import com.todoroo.andlib.utility.DateUtilities.now import com.todoroo.andlib.utility.DateUtilities.now
import com.todoroo.astrid.activity.BeastModePreferences import com.todoroo.astrid.activity.BeastModePreferences
@ -463,7 +464,8 @@ class Preferences @JvmOverloads constructor(
fun bundleNotifications(): Boolean = getBoolean(R.string.p_bundle_notifications, true) fun bundleNotifications(): Boolean = getBoolean(R.string.p_bundle_notifications, true)
fun usePersistentReminders(): Boolean = getBoolean(R.string.p_rmd_persistent, true) fun usePersistentReminders(): Boolean =
AndroidUtilities.preUpsideDownCake() && getBoolean(R.string.p_rmd_persistent, true)
var isSyncOngoing: Boolean var isSyncOngoing: Boolean
get() = syncFlags.any { getBoolean(it, false) } get() = syncFlags.any { getBoolean(it, false) }

@ -142,6 +142,11 @@ class Notifications : InjectingPreferenceFragment() {
R.string.p_rmd_vibrate, R.string.p_rmd_vibrate,
R.string.p_led_notification R.string.p_led_notification
) )
requires(
AndroidUtilities.preUpsideDownCake(),
R.string.p_rmd_persistent,
R.string.p_wearable_notifications,
)
} }
override fun onResume() { override fun onResume() {

Loading…
Cancel
Save