From 5cc9f0917e735ab222c6d217e4f2ecbb3472d9f4 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 17 Nov 2026 14:46:29 +0100 Subject: [PATCH 1/5] refactor(power-save): naming Signed-off-by: alperozturk96 --- .../nextcloud/utils/PowerManagementFactory.kt | 8 +- .../client/device/PowerManagementService.kt | 15 +- .../device/PowerManagementServiceImpl.kt | 6 +- .../client/jobs/ContentObserverWork.kt | 2 +- .../jobs/autoUpload/AutoUploadWorker.kt | 4 +- .../ui/component/UploadWarningCard.kt | 125 ---------------- .../powerSettings/PowerSavingBannerState.kt | 25 ++++ .../powerSettings/PowerSettingsBanners.kt | 136 ++++++++++++++++++ .../fragment/autoUpload/AutoUploadFragment.kt | 14 +- .../fragment/uploadList/UploadListFragment.kt | 14 +- .../main/res/layout/fragment_auto_upload.xml | 4 +- .../main/res/layout/fragment_upload_list.xml | 4 +- ...ng_card.xml => power_settings_banners.xml} | 24 ++-- app/src/main/res/values/strings.xml | 9 +- .../device/TestPowerManagementService.kt | 6 +- .../client/jobs/ContentObserverWorkTest.kt | 2 +- 16 files changed, 222 insertions(+), 176 deletions(-) delete mode 100644 app/src/main/java/com/nextcloud/ui/component/UploadWarningCard.kt create mode 100644 app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSavingBannerState.kt create mode 100644 app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBanners.kt rename app/src/main/res/layout/{upload_warning_card.xml => power_settings_banners.xml} (87%) diff --git a/app/src/androidTest/java/com/nextcloud/utils/PowerManagementFactory.kt b/app/src/androidTest/java/com/nextcloud/utils/PowerManagementFactory.kt index d953d091b13b..19d7df8bb6ab 100644 --- a/app/src/androidTest/java/com/nextcloud/utils/PowerManagementFactory.kt +++ b/app/src/androidTest/java/com/nextcloud/utils/PowerManagementFactory.kt @@ -13,26 +13,26 @@ import com.nextcloud.client.device.PowerManagementService object PowerManagementFactory { @JvmStatic val mock: PowerManagementService = object : PowerManagementService { - override val isIgnoringOptimization: Boolean + override val isExemptFromBatteryOptimization: Boolean get() = true override val isPowerSavingEnabled: Boolean get() = false override val battery: BatteryStatus get() = BatteryStatus(false, 0) - override val blocksAutoUpload: Boolean + override val isAppRestrictedByPowerSaving: Boolean get() = false } @JvmStatic @Suppress("MagicNumber") val mockCharging: PowerManagementService = object : PowerManagementService { - override val isIgnoringOptimization: Boolean + override val isExemptFromBatteryOptimization: Boolean get() = true override val isPowerSavingEnabled: Boolean get() = false override val battery: BatteryStatus get() = BatteryStatus(true, 100) - override val blocksAutoUpload: Boolean + override val isAppRestrictedByPowerSaving: Boolean get() = false } } diff --git a/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt b/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt index c5563e46d1a5..6dfcdee01a39 100644 --- a/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt +++ b/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt @@ -22,14 +22,23 @@ interface PowerManagementService { val isPowerSavingEnabled: Boolean /** - * Checks app is excluded from battery optimization or not + * True when the user set the app's battery usage to "Unrestricted", which puts the app on Android's power save + * allowlist. Android then exempts the app from power saving mode as well: its jobs and alarms are not restricted + * while power saving mode is on (AOSP `AppStateTrackerImpl.areJobsRestricted` and + * `areAlarmsRestrictedByBatterySaver` return false for allowlisted apps). + * + * @see android.os.PowerManager.isIgnoringBatteryOptimizations */ - val isIgnoringOptimization: Boolean + val isExemptFromBatteryOptimization: Boolean /** * Checks current battery status using platform [android.os.BatteryManager] */ val battery: BatteryStatus - val blocksAutoUpload: Boolean + /** + * True when power saving mode is on and the app is not exempt from battery optimization. Follows the + * same rule as Android, so an exempt app keeps uploading in power saving mode. + */ + val isAppRestrictedByPowerSaving: Boolean } diff --git a/app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt b/app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt index d28943b1849d..507ef4f31d68 100644 --- a/app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt +++ b/app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt @@ -27,7 +27,7 @@ internal class PowerManagementServiceImpl( } } - override val isIgnoringOptimization: Boolean + override val isExemptFromBatteryOptimization: Boolean get() { val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager return powerManager.isIgnoringBatteryOptimizations(context.packageName) @@ -38,8 +38,8 @@ internal class PowerManagementServiceImpl( return platformPowerManager.isPowerSaveMode } - override val blocksAutoUpload: Boolean - get() = isPowerSavingEnabled && !isIgnoringOptimization + override val isAppRestrictedByPowerSaving: Boolean + get() = isPowerSavingEnabled && !isExemptFromBatteryOptimization @Suppress("MagicNumber") // 100% is 100, we're not doing Cobol override val battery: BatteryStatus diff --git a/app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt b/app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt index 8d6f52e0e0a7..adb6a829a54c 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt @@ -71,7 +71,7 @@ class ContentObserverWork( } private suspend fun checkAndTriggerAutoUpload() = withContext(Dispatchers.IO) { - if (powerManagementService.blocksAutoUpload) { + if (powerManagementService.isAppRestrictedByPowerSaving) { Log_OC.w(TAG, "⚡ Power saving mode active — skipping file sync.") return@withContext } diff --git a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt index b2a70f7ed622..d6b9d922d012 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt @@ -193,7 +193,7 @@ class AutoUploadWorker( } private fun isBlocked(syncedFolderID: Long): Boolean { - if (powerManagementService.blocksAutoUpload && !overridePowerSaving) { + if (powerManagementService.isAppRestrictedByPowerSaving && !overridePowerSaving) { Log_OC.w(TAG, "⚡ Skipping: device is in power saving mode") return true } @@ -499,7 +499,7 @@ class AutoUploadWorker( true, FileDataStorageManager(user, context.contentResolver) ).apply { - if (overridePowerSaving || !powerManagementService.blocksAutoUpload) { + if (overridePowerSaving || !powerManagementService.isAppRestrictedByPowerSaving) { isIgnoringPowerSaveMode = true } } diff --git a/app/src/main/java/com/nextcloud/ui/component/UploadWarningCard.kt b/app/src/main/java/com/nextcloud/ui/component/UploadWarningCard.kt deleted file mode 100644 index ba4b06421637..000000000000 --- a/app/src/main/java/com/nextcloud/ui/component/UploadWarningCard.kt +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-License-Identifier: AGPL-3.0-or-later - */ - -package com.nextcloud.ui.component - -import android.annotation.SuppressLint -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter -import android.os.PowerManager -import android.provider.Settings -import android.view.View -import androidx.core.net.toUri -import com.nextcloud.client.device.PowerManagementService -import com.nextcloud.client.jobs.BackgroundJobManager -import com.nextcloud.utils.SnackbarUtil -import com.nextcloud.utils.extensions.setVisibleIf -import com.owncloud.android.databinding.UploadWarningCardBinding -import com.owncloud.android.datamodel.SyncedFolderProvider -import com.owncloud.android.utils.FilesSyncHelper -import com.owncloud.android.utils.theme.ViewThemeUtils -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext - -class UploadWarningCard( - private val context: Context, - private val powerManagementService: PowerManagementService, - private val syncedFolderProvider: SyncedFolderProvider, - private val backgroundJobManager: BackgroundJobManager, - private val scope: CoroutineScope, - private val viewThemeUtils: ViewThemeUtils -) { - fun bind(binding: UploadWarningCardBinding) { - val isBatterySaver = powerManagementService.blocksAutoUpload - val isIgnoringOptimization = powerManagementService.isIgnoringOptimization - - binding.root.setVisibleIf(isBatterySaver || !isIgnoringOptimization) - - if (isBatterySaver) { - viewThemeUtils.material.run { - themeCardView(binding.batterySaverLayout) - colorMaterialButtonPrimaryBorderless(binding.batterySaverButton) - colorMaterialButtonPrimaryBorderless(binding.syncNowButton) - } - - binding.batterySaverLayout.visibility = View.VISIBLE - binding.batterySaverButton.setOnClickListener { - openBatterySaverPage() - } - binding.syncNowButton.setOnClickListener { - startAutoUploadIgnoringBatterySaver(it) - } - } else { - binding.batterySaverLayout.visibility = View.GONE - } - - if (!isIgnoringOptimization) { - viewThemeUtils.material.themeCardView(binding.backgroundActivityLimitedLayout) - binding.backgroundActivityLimitedLayout.visibility = View.VISIBLE - binding.backgroundActivityLimitedButton.setOnClickListener { - showIgnoreBatteryOptimizationDialog() - } - viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(binding.backgroundActivityLimitedButton) - } else { - binding.backgroundActivityLimitedLayout.visibility = View.GONE - } - } - - // region listen power mode changes - private var binding: UploadWarningCardBinding? = null - - private val batterySaverReceiver = object : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - if (intent.action == PowerManager.ACTION_POWER_SAVE_MODE_CHANGED) { - binding?.let { bind(it) } - } - } - } - - fun register(context: Context, binding: UploadWarningCardBinding) { - this.binding = binding - bind(binding) - context.registerReceiver(batterySaverReceiver, IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED)) - } - - fun unregister(context: Context) { - context.unregisterReceiver(batterySaverReceiver) - binding = null - } - // endregion - - /** - * Opens page for OS's battery saver screen. - */ - private fun openBatterySaverPage() { - context.startActivity(Intent(Settings.ACTION_BATTERY_SAVER_SETTINGS)) - } - - /** - * Shows dialog to allow background usage for app. - */ - @SuppressLint("BatteryLife") - private fun showIgnoreBatteryOptimizationDialog() { - val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) - intent.data = "package:${context.packageName}".toUri() - context.startActivity(intent) - } - - private fun startAutoUploadIgnoringBatterySaver(view: View) { - scope.launch { - val result = withContext(Dispatchers.IO) { - FilesSyncHelper.startAutoUploadIgnoringPowerSaving(syncedFolderProvider, backgroundJobManager) - } - - SnackbarUtil.show(view, result.messageId) - } - } -} diff --git a/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSavingBannerState.kt b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSavingBannerState.kt new file mode 100644 index 000000000000..4cb23c585ff2 --- /dev/null +++ b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSavingBannerState.kt @@ -0,0 +1,25 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.nextcloud.ui.component.powerSettings + +import com.nextcloud.client.device.PowerManagementService + +enum class PowerSavingBannerState { + HIDDEN, + RESTRICTING_APP, + IGNORED_BY_APP; + + companion object { + fun from(powerManagementService: PowerManagementService): PowerSavingBannerState { + if (!powerManagementService.isPowerSavingEnabled) return HIDDEN + if (powerManagementService.isAppRestrictedByPowerSaving) return RESTRICTING_APP + + return IGNORED_BY_APP + } + } +} diff --git a/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBanners.kt b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBanners.kt new file mode 100644 index 000000000000..0f3986fbc034 --- /dev/null +++ b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBanners.kt @@ -0,0 +1,136 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.nextcloud.ui.component.powerSettings + +import android.annotation.SuppressLint +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.os.PowerManager +import android.provider.Settings +import android.view.View +import androidx.core.net.toUri +import com.nextcloud.client.device.PowerManagementService +import com.nextcloud.client.jobs.BackgroundJobManager +import com.nextcloud.utils.SnackbarUtil +import com.nextcloud.utils.extensions.setVisibleIf +import com.owncloud.android.R +import com.owncloud.android.databinding.PowerSettingsBannersBinding +import com.owncloud.android.datamodel.SyncedFolderProvider +import com.owncloud.android.utils.FilesSyncHelper +import com.owncloud.android.utils.theme.ViewThemeUtils +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +class PowerSettingsBanners( + private val context: Context, + private val powerManagementService: PowerManagementService, + private val syncedFolderProvider: SyncedFolderProvider, + private val backgroundJobManager: BackgroundJobManager, + private val scope: CoroutineScope, + private val viewThemeUtils: ViewThemeUtils +) { + private var binding: PowerSettingsBannersBinding? = null + + private val powerSavingModeChangedReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + if (intent.action != PowerManager.ACTION_POWER_SAVE_MODE_CHANGED) return + + binding?.let { bind(it) } + } + } + + fun register(context: Context, binding: PowerSettingsBannersBinding) { + this.binding = binding + bind(binding) + + context.registerReceiver( + powerSavingModeChangedReceiver, + IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED) + ) + } + + fun unregister(context: Context) { + context.unregisterReceiver(powerSavingModeChangedReceiver) + binding = null + } + + fun bind(binding: PowerSettingsBannersBinding) { + val powerSavingBannerState = PowerSavingBannerState.from(powerManagementService) + val isExemptFromBatteryOptimization = powerManagementService.isExemptFromBatteryOptimization + + binding.root.setVisibleIf( + powerSavingBannerState != PowerSavingBannerState.HIDDEN || !isExemptFromBatteryOptimization + ) + bindPowerSavingBanner(binding, powerSavingBannerState) + + bindBatteryOptimizationBanner(binding, isExemptFromBatteryOptimization) + } + + private fun bindPowerSavingBanner(binding: PowerSettingsBannersBinding, state: PowerSavingBannerState) { + binding.powerSavingBanner.setVisibleIf(state != PowerSavingBannerState.HIDDEN) + if (state == PowerSavingBannerState.HIDDEN) return + + viewThemeUtils.material.run { + themeCardView(binding.powerSavingBanner) + colorMaterialButtonPrimaryBorderless(binding.powerSavingSettingsButton) + colorMaterialButtonPrimaryBorderless(binding.powerSavingSyncNowButton) + } + + val messageId = if (state == PowerSavingBannerState.RESTRICTING_APP) { + R.string.power_saving_banner_restricting_app_message + } else { + R.string.power_saving_banner_ignored_by_app_message + } + binding.powerSavingBannerMessage.setText(messageId) + binding.powerSavingBannerActions.setVisibleIf(state == PowerSavingBannerState.RESTRICTING_APP) + binding.powerSavingSettingsButton.setOnClickListener { openPowerSavingSettings() } + + binding.powerSavingSyncNowButton.setOnClickListener { startAutoUploadIgnoringPowerSaving(it) } + } + + private fun bindBatteryOptimizationBanner( + binding: PowerSettingsBannersBinding, + isExemptFromBatteryOptimization: Boolean + ) { + binding.batteryOptimizationBanner.setVisibleIf(!isExemptFromBatteryOptimization) + if (isExemptFromBatteryOptimization) return + + viewThemeUtils.material.run { + themeCardView(binding.batteryOptimizationBanner) + colorMaterialButtonPrimaryBorderless(binding.batteryOptimizationExemptButton) + } + + binding.batteryOptimizationExemptButton.setOnClickListener { requestBatteryOptimizationExemption() } + } + + private fun openPowerSavingSettings() { + context.startActivity(Intent(Settings.ACTION_BATTERY_SAVER_SETTINGS)) + } + + @SuppressLint("BatteryLife") + private fun requestBatteryOptimizationExemption() { + val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) + intent.data = "package:${context.packageName}".toUri() + + context.startActivity(intent) + } + + private fun startAutoUploadIgnoringPowerSaving(view: View) { + scope.launch { + val result = withContext(Dispatchers.IO) { + FilesSyncHelper.startAutoUploadIgnoringPowerSaving(syncedFolderProvider, backgroundJobManager) + } + + SnackbarUtil.show(view, result.messageId) + } + } +} diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/AutoUploadFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/AutoUploadFragment.kt index a83065469604..10fec5064f4e 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/AutoUploadFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/autoUpload/AutoUploadFragment.kt @@ -22,7 +22,7 @@ import com.nextcloud.client.core.Clock import com.nextcloud.client.device.PowerManagementService import com.nextcloud.client.jobs.BackgroundJobManager import com.nextcloud.client.network.ConnectivityService -import com.nextcloud.ui.component.UploadWarningCard +import com.nextcloud.ui.component.powerSettings.PowerSettingsBanners import com.nextcloud.utils.extensions.getTypedActivity import com.nextcloud.utils.extensions.setVisibleIf import com.owncloud.android.R @@ -76,7 +76,7 @@ class AutoUploadFragment : lateinit var adapter: SyncedFolderAdapter private var binding: FragmentAutoUploadBinding? = null - private var uploadWarningCard: UploadWarningCard? = null + private var powerSettingsBanners: PowerSettingsBanners? = null private var emptyContent: AutoUploadEmptyContent? = null private lateinit var itemsLoader: AutoUploadItemsLoader private lateinit var dialogs: AutoUploadDialogs @@ -132,12 +132,12 @@ class AutoUploadFragment : if (PermissionUtil.checkStoragePermission(activity)) { load(activity) } - uploadWarningCard?.bind(binding.autoUploadBatterySaverWarningCard) + powerSettingsBanners?.bind(binding.powerSettingsBanners) } override fun onDestroyView() { - uploadWarningCard?.unregister(requireContext()) - uploadWarningCard = null + powerSettingsBanners?.unregister(requireContext()) + powerSettingsBanners = null emptyContent = null super.onDestroyView() binding = null @@ -191,7 +191,7 @@ class AutoUploadFragment : getAdapter = { adapter }, onItemVisibilityChanged = { emptyContent?.checkAndShowEmptyListContent() } ) - uploadWarningCard = UploadWarningCard( + powerSettingsBanners = PowerSettingsBanners( activity, powerManagementService, syncedFolderProvider, @@ -214,7 +214,7 @@ class AutoUploadFragment : powerManagementService, connectivityService ) - uploadWarningCard?.register(activity, binding.autoUploadBatterySaverWarningCard) + powerSettingsBanners?.register(activity, binding.powerSettingsBanners) emptyContent = AutoUploadEmptyContent(binding, adapter, viewThemeUtils) val layoutManager = GridLayoutManager(activity, gridWidth) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/uploadList/UploadListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/uploadList/UploadListFragment.kt index 74306573276b..5a1140857796 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/uploadList/UploadListFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/uploadList/UploadListFragment.kt @@ -31,7 +31,7 @@ import com.nextcloud.client.jobs.upload.FileUploadHelper import com.nextcloud.client.network.ConnectivityService import com.nextcloud.client.preferences.AppPreferences import com.nextcloud.client.utils.TrailingThrottle -import com.nextcloud.ui.component.UploadWarningCard +import com.nextcloud.ui.component.powerSettings.PowerSettingsBanners import com.nextcloud.utils.extensions.collectWhenStarted import com.nextcloud.utils.extensions.getParcelableArgument import com.nextcloud.utils.extensions.getTypedActivity @@ -82,7 +82,7 @@ class UploadListFragment : @Inject lateinit var viewThemeUtils: ViewThemeUtils private var binding: FragmentUploadListBinding? = null - private var uploadWarningCard: UploadWarningCard? = null + private var powerSettingsBanners: PowerSettingsBanners? = null private lateinit var uploadListAdapter: UploadListAdapter private lateinit var conflictHandler: UploadListConflictHandler private lateinit var credentialsHandler: UploadListCredentialsHandler @@ -144,7 +144,7 @@ class UploadListFragment : override fun onResume() { super.onResume() - binding?.autoUploadBatterySaverWarningCard?.let { uploadWarningCard?.bind(it) } + binding?.powerSettingsBanners?.let { powerSettingsBanners?.bind(it) } loadItems() } @@ -154,8 +154,8 @@ class UploadListFragment : } override fun onDestroyView() { - uploadWarningCard?.unregister(requireContext()) - uploadWarningCard = null + powerSettingsBanners?.unregister(requireContext()) + powerSettingsBanners = null super.onDestroyView() binding = null } @@ -178,7 +178,7 @@ class UploadListFragment : } private fun setupWarningCard(activity: NavigatorActivity, binding: FragmentUploadListBinding) { - uploadWarningCard = UploadWarningCard( + powerSettingsBanners = PowerSettingsBanners( activity, powerManagementService, syncedFolderProvider, @@ -186,7 +186,7 @@ class UploadListFragment : viewLifecycleOwner.lifecycleScope, viewThemeUtils ).apply { - register(activity, binding.autoUploadBatterySaverWarningCard) + register(activity, binding.powerSettingsBanners) } } diff --git a/app/src/main/res/layout/fragment_auto_upload.xml b/app/src/main/res/layout/fragment_auto_upload.xml index 379ed1a766db..2ad4b2aa7bbe 100644 --- a/app/src/main/res/layout/fragment_auto_upload.xml +++ b/app/src/main/res/layout/fragment_auto_upload.xml @@ -15,8 +15,8 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/upload_warning_card.xml b/app/src/main/res/layout/power_settings_banners.xml similarity index 87% rename from app/src/main/res/layout/upload_warning_card.xml rename to app/src/main/res/layout/power_settings_banners.xml index 1e37f351367b..8192606d4925 100644 --- a/app/src/main/res/layout/upload_warning_card.xml +++ b/app/src/main/res/layout/power_settings_banners.xml @@ -17,7 +17,7 @@ android:orientation="vertical"> + tools:text="@string/power_saving_banner_restricting_app_message" /> + android:text="@string/power_saving_settings_action" /> + android:textColor="@color/text_color" /> + android:text="@string/battery_optimization_exempt_action" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f3d6f60bf3e1..259591881077 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1568,10 +1568,11 @@ This folder is best viewed in %1$s. Open in %1$s Delete auto-upload folder? - Battery saver is active and may pause uploads. - Nextcloud\'s background activity is limited by battery optimization. - Open battery saver settings - Allow background activity + Power saving mode is on, so auto upload is paused until you turn it off. + Power saving mode is on, but Nextcloud has unrestricted battery usage, so auto upload keeps running. + Open power saving settings + Nextcloud\'s battery usage is restricted, so Android may delay auto upload. With unrestricted battery usage, auto upload also keeps running in power saving mode. + Allow unrestricted battery usage Sync now Auto upload started Auto upload already running diff --git a/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt b/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt index 87d1ec7c0418..0a8705442503 100644 --- a/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt +++ b/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt @@ -103,7 +103,7 @@ class TestPowerManagementService { whenever(platformPowerManager.isPowerSaveMode).thenReturn(true) givenBatteryOptimizationIsIgnored(false) - assertTrue(powerManagementService.blocksAutoUpload) + assertTrue(powerManagementService.isAppRestrictedByPowerSaving) } @Test @@ -111,14 +111,14 @@ class TestPowerManagementService { whenever(platformPowerManager.isPowerSaveMode).thenReturn(true) givenBatteryOptimizationIsIgnored(true) - assertFalse(powerManagementService.blocksAutoUpload) + assertFalse(powerManagementService.isAppRestrictedByPowerSaving) } @Test fun `auto upload is not blocked while battery saver is off`() { whenever(platformPowerManager.isPowerSaveMode).thenReturn(false) - assertFalse(powerManagementService.blocksAutoUpload) + assertFalse(powerManagementService.isAppRestrictedByPowerSaving) } } diff --git a/app/src/test/java/com/nextcloud/client/jobs/ContentObserverWorkTest.kt b/app/src/test/java/com/nextcloud/client/jobs/ContentObserverWorkTest.kt index 342129b8fa63..c98706da5dfe 100644 --- a/app/src/test/java/com/nextcloud/client/jobs/ContentObserverWorkTest.kt +++ b/app/src/test/java/com/nextcloud/client/jobs/ContentObserverWorkTest.kt @@ -98,7 +98,7 @@ class ContentObserverWorkTest { @Test fun power_saving_stops_a_run_before_folders_are_read() { runBlocking { - whenever(powerManagementService.blocksAutoUpload).thenReturn(true) + whenever(powerManagementService.isAppRestrictedByPowerSaving).thenReturn(true) worker.doWork() From b8f0fc096c2cf3c2d714ba5e56141bcb6bb02813 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 17 Nov 2026 14:48:05 +0100 Subject: [PATCH 2/5] fix(upload): power save check Signed-off-by: alperozturk96 --- .../java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt | 4 ++-- .../com/owncloud/android/operations/UploadFileOperation.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt index 0203dc81dd54..6dc57110b355 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt @@ -467,8 +467,8 @@ class FileUploadHelper { conditions = UploadResult.DELAYED_FOR_CHARGING } - // check that device is not in power save mode; delay upload otherwise - if (powerManagementService.isPowerSavingEnabled) { + // check that power save mode is not restricting the app; delay upload otherwise + if (powerManagementService.isAppRestrictedByPowerSaving) { conditions = UploadResult.DELAYED_IN_POWER_SAVE_MODE } diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java index 8ed1907a113f..b238f18cfb2d 100644 --- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java +++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java @@ -1009,8 +1009,8 @@ private RemoteOperationResult checkConditions(File originalFile) { remoteOperationResult = new RemoteOperationResult(ResultCode.DELAYED_FOR_CHARGING); } - // check that device is not in power save mode - if (!mIgnoringPowerSaveMode && powerManagementService.isPowerSavingEnabled()) { + // check that power save mode is not restricting the app + if (!mIgnoringPowerSaveMode && powerManagementService.isAppRestrictedByPowerSaving()) { Log_OC.d(TAG, "Upload delayed because device is in power save mode: " + getRemotePath()); remoteOperationResult = new RemoteOperationResult(ResultCode.DELAYED_IN_POWER_SAVE_MODE); } From 6a6377b1af850f6bd6842002937cfb08980a0cad Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 17 Nov 2026 15:11:59 +0100 Subject: [PATCH 3/5] clear comments Signed-off-by: alperozturk96 --- .../java/com/nextcloud/client/device/PowerManagementService.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt b/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt index 6dfcdee01a39..f2530f9705f1 100644 --- a/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt +++ b/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt @@ -24,8 +24,7 @@ interface PowerManagementService { /** * True when the user set the app's battery usage to "Unrestricted", which puts the app on Android's power save * allowlist. Android then exempts the app from power saving mode as well: its jobs and alarms are not restricted - * while power saving mode is on (AOSP `AppStateTrackerImpl.areJobsRestricted` and - * `areAlarmsRestrictedByBatterySaver` return false for allowlisted apps). + * while power saving mode is on. * * @see android.os.PowerManager.isIgnoringBatteryOptimizations */ From d02d063624dbb4842585de5ac7bd897320a84fca Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 17 Nov 2026 15:26:23 +0100 Subject: [PATCH 4/5] use state solely Signed-off-by: alperozturk96 --- .../powerSettings/PowerSavingBannerState.kt | 25 ------------- .../powerSettings/PowerSettingsBanners.kt | 37 +++++++------------ .../PowerSettingsBannersState.kt | 32 ++++++++++++++++ 3 files changed, 46 insertions(+), 48 deletions(-) delete mode 100644 app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSavingBannerState.kt create mode 100644 app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBannersState.kt diff --git a/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSavingBannerState.kt b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSavingBannerState.kt deleted file mode 100644 index 4cb23c585ff2..000000000000 --- a/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSavingBannerState.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-License-Identifier: AGPL-3.0-or-later - */ - -package com.nextcloud.ui.component.powerSettings - -import com.nextcloud.client.device.PowerManagementService - -enum class PowerSavingBannerState { - HIDDEN, - RESTRICTING_APP, - IGNORED_BY_APP; - - companion object { - fun from(powerManagementService: PowerManagementService): PowerSavingBannerState { - if (!powerManagementService.isPowerSavingEnabled) return HIDDEN - if (powerManagementService.isAppRestrictedByPowerSaving) return RESTRICTING_APP - - return IGNORED_BY_APP - } - } -} diff --git a/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBanners.kt b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBanners.kt index 0f3986fbc034..bf38a96bde6f 100644 --- a/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBanners.kt +++ b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBanners.kt @@ -20,7 +20,6 @@ import com.nextcloud.client.device.PowerManagementService import com.nextcloud.client.jobs.BackgroundJobManager import com.nextcloud.utils.SnackbarUtil import com.nextcloud.utils.extensions.setVisibleIf -import com.owncloud.android.R import com.owncloud.android.databinding.PowerSettingsBannersBinding import com.owncloud.android.datamodel.SyncedFolderProvider import com.owncloud.android.utils.FilesSyncHelper @@ -64,20 +63,18 @@ class PowerSettingsBanners( } fun bind(binding: PowerSettingsBannersBinding) { - val powerSavingBannerState = PowerSavingBannerState.from(powerManagementService) - val isExemptFromBatteryOptimization = powerManagementService.isExemptFromBatteryOptimization + val state = PowerSettingsBannersState.from(powerManagementService) - binding.root.setVisibleIf( - powerSavingBannerState != PowerSavingBannerState.HIDDEN || !isExemptFromBatteryOptimization - ) - bindPowerSavingBanner(binding, powerSavingBannerState) + binding.root.setVisibleIf(state != PowerSettingsBannersState.UNRESTRICTED) + bindPowerSavingBanner(binding, state) - bindBatteryOptimizationBanner(binding, isExemptFromBatteryOptimization) + bindBatteryOptimizationBanner(binding, state) } - private fun bindPowerSavingBanner(binding: PowerSettingsBannersBinding, state: PowerSavingBannerState) { - binding.powerSavingBanner.setVisibleIf(state != PowerSavingBannerState.HIDDEN) - if (state == PowerSavingBannerState.HIDDEN) return + private fun bindPowerSavingBanner(binding: PowerSettingsBannersBinding, state: PowerSettingsBannersState) { + val messageId = state.powerSavingMessageId + binding.powerSavingBanner.setVisibleIf(messageId != null) + if (messageId == null) return viewThemeUtils.material.run { themeCardView(binding.powerSavingBanner) @@ -85,24 +82,18 @@ class PowerSettingsBanners( colorMaterialButtonPrimaryBorderless(binding.powerSavingSyncNowButton) } - val messageId = if (state == PowerSavingBannerState.RESTRICTING_APP) { - R.string.power_saving_banner_restricting_app_message - } else { - R.string.power_saving_banner_ignored_by_app_message - } binding.powerSavingBannerMessage.setText(messageId) - binding.powerSavingBannerActions.setVisibleIf(state == PowerSavingBannerState.RESTRICTING_APP) + binding.powerSavingBannerActions.setVisibleIf( + state == PowerSettingsBannersState.POWER_SAVING_RESTRICTING_APP + ) binding.powerSavingSettingsButton.setOnClickListener { openPowerSavingSettings() } binding.powerSavingSyncNowButton.setOnClickListener { startAutoUploadIgnoringPowerSaving(it) } } - private fun bindBatteryOptimizationBanner( - binding: PowerSettingsBannersBinding, - isExemptFromBatteryOptimization: Boolean - ) { - binding.batteryOptimizationBanner.setVisibleIf(!isExemptFromBatteryOptimization) - if (isExemptFromBatteryOptimization) return + private fun bindBatteryOptimizationBanner(binding: PowerSettingsBannersBinding, state: PowerSettingsBannersState) { + binding.batteryOptimizationBanner.setVisibleIf(state.isBatteryOptimizationBannerVisible) + if (!state.isBatteryOptimizationBannerVisible) return viewThemeUtils.material.run { themeCardView(binding.batteryOptimizationBanner) diff --git a/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBannersState.kt b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBannersState.kt new file mode 100644 index 000000000000..80cf9c13ace4 --- /dev/null +++ b/app/src/main/java/com/nextcloud/ui/component/powerSettings/PowerSettingsBannersState.kt @@ -0,0 +1,32 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.nextcloud.ui.component.powerSettings + +import androidx.annotation.StringRes +import com.nextcloud.client.device.PowerManagementService +import com.owncloud.android.R + +enum class PowerSettingsBannersState(@StringRes val powerSavingMessageId: Int?) { + UNRESTRICTED(null), + BATTERY_OPTIMIZED(null), + POWER_SAVING_RESTRICTING_APP(R.string.power_saving_banner_restricting_app_message), + POWER_SAVING_IGNORED_BY_APP(R.string.power_saving_banner_ignored_by_app_message); + + val isBatteryOptimizationBannerVisible: Boolean + get() = this == BATTERY_OPTIMIZED || this == POWER_SAVING_RESTRICTING_APP + + companion object { + fun from(service: PowerManagementService): PowerSettingsBannersState { + if (service.isAppRestrictedByPowerSaving) return POWER_SAVING_RESTRICTING_APP + if (service.isPowerSavingEnabled) return POWER_SAVING_IGNORED_BY_APP + if (service.isExemptFromBatteryOptimization) return UNRESTRICTED + + return BATTERY_OPTIMIZED + } + } +} From 1b08f6750e40a08896ec71de1e82839440bb1de8 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 17 Nov 2026 15:43:34 +0100 Subject: [PATCH 5/5] use state solely Signed-off-by: alperozturk96 --- .../java/com/nextcloud/client/device/PowerManagementService.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt b/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt index f2530f9705f1..b8cde4c490be 100644 --- a/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt +++ b/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt @@ -36,8 +36,7 @@ interface PowerManagementService { val battery: BatteryStatus /** - * True when power saving mode is on and the app is not exempt from battery optimization. Follows the - * same rule as Android, so an exempt app keeps uploading in power saving mode. + * True when power saving mode is on and the app is not exempt from battery optimization. */ val isAppRestrictedByPowerSaving: Boolean }