From 279676716fb39a2c79edcfacae80732cdab922e4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 26 Oct 2025 18:16:58 +0100 Subject: [PATCH] Fix showing background sync check starting Android 15 (not above 15) Change-Id: Id3b761ddfd608e0fa715221e8e37e68f6a0432c2 --- .../src/main/java/im/vector/app/features/home/HomeActivity.kt | 2 +- .../notifications/VectorSettingsNotificationFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt index 406df13b8c..0c4898aa6a 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt @@ -446,7 +446,7 @@ class HomeActivity : // Android 15 is very strict with background sync service usage and likes to shoot us when we take too long, making the app crash. // Complain first time when starting the app after initial sync is done if (status !is SyncRequestState.InitialSyncRequestState) { - if (!hasComplainedAboutBackgroundSync && Build.VERSION.SDK_INT > 35 && buildMeta.flavorDescription == "FDroid" && vectorPreferences.isBackgroundSyncEnabled()) { + if (!hasComplainedAboutBackgroundSync && Build.VERSION.SDK_INT >= 35 && buildMeta.flavorDescription == "FDroid" && vectorPreferences.isBackgroundSyncEnabled()) { hasComplainedAboutBackgroundSync = true promptNeedsPushEvent() } diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt index f1206ce8db..94550a59fa 100644 --- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt @@ -153,7 +153,7 @@ class VectorSettingsNotificationFragment : // SC addition findPreference("SC_SETTINGS_PROMPT_UNIFIED_PUSH_TITLE")?.let { - it.isVisible = Build.VERSION.SDK_INT > 35 && buildMeta.flavorDescription == "FDroid" + it.isVisible = Build.VERSION.SDK_INT >= 35 && buildMeta.flavorDescription == "FDroid" it.onPreferenceClickListener = Preference.OnPreferenceClickListener { startActivity(Intent(Intent.ACTION_VIEW, "https://unifiedpush.org/".toUri())) true