From b27ab6240df9bf6f334fe2f469b20becbe6a6ded Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 28 Feb 2024 07:45:28 +0100 Subject: [PATCH] Pending intent background options compatibility --- app/src/main/java/eu/faircode/email/Helper.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 4fb608db5e..dc54f5dedb 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -19,6 +19,7 @@ package eu.faircode.email; Copyright 2018-2024 by Marcel Bokhorst (M66B) */ +import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED; import static android.os.Process.THREAD_PRIORITY_BACKGROUND; import static androidx.browser.customtabs.CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION; import static com.google.android.material.textfield.TextInputLayout.END_ICON_NONE; @@ -1936,11 +1937,16 @@ public class Helper { } static Bundle getBackgroundActivityOptions() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return null; - ActivityOptions options = ActivityOptions.makeBasic(); - options.setPendingIntentBackgroundActivityLaunchAllowed(true); - return options.toBundle(); + else { + ActivityOptions options = ActivityOptions.makeBasic(); + if (Build.VERSION.SDK_INT == Build.VERSION_CODES.TIRAMISU) + options.setPendingIntentBackgroundActivityLaunchAllowed(true); + else + options.setPendingIntentBackgroundActivityStartMode(MODE_BACKGROUND_ACTIVITY_START_ALLOWED); + return options.toBundle(); + } } static Fragment recreateFragment(Fragment fragment, FragmentManager fm) {