feat(auto-upload): battery saver, batter optimization indication

alperozturk96 · alperozturk96 · commit 753a8090dd3a · 2026-04-28T16:09:54.000+02:00
Signed-off-by: alperozturk96 &lt;alper_ozturk@proton.me&gt;
diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -393,6 +393,11 @@ public Connectivity getConnectivity() {
         };
 
         PowerManagementService powerManagementServiceMock = new PowerManagementService() {
+            @Override
+            public boolean isIgnoringOptimization() {
+                return true;
+            }
+
             @NonNull
             @Override
             public BatteryStatus getBattery() {
diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java
@@ -225,6 +225,11 @@ public Connectivity getConnectivity() {
         };
 
         PowerManagementService powerManagementServiceMock = new PowerManagementService() {
+            @Override
+            public boolean isIgnoringOptimization() {
+                return true;
+            }
+
             @NonNull
             @Override
             public BatteryStatus getBattery() {
diff --git a/app/src/androidTest/java/com/owncloud/android/UploadIT.java b/app/src/androidTest/java/com/owncloud/android/UploadIT.java
@@ -78,6 +78,11 @@ public Connectivity getConnectivity() {
     };
 
     private PowerManagementService powerManagementServiceMock = new PowerManagementService() {
+        @Override
+        public boolean isIgnoringOptimization() {
+            return true;
+        }
+
         @Override
         public boolean isPowerSavingEnabled() {
             return false;
@@ -226,6 +231,11 @@ public void testUploadOnChargingOnlyButNotCharging() {
     @Test
     public void testUploadOnChargingOnlyAndCharging() {
         PowerManagementService powerManagementServiceMock = new PowerManagementService() {
+            @Override
+            public boolean isIgnoringOptimization() {
+                return true;
+            }
+
             @Override
             public boolean isPowerSavingEnabled() {
                 return false;
diff --git a/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt b/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt
@@ -43,6 +43,9 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
     }
 
     private val powerManagementServiceMock: PowerManagementService = object : PowerManagementService {
+        override val isIgnoringOptimization: Boolean
+            get() = true
+
         override val isPowerSavingEnabled: 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
@@ -21,6 +21,11 @@ interface PowerManagementService {
      */
     val isPowerSavingEnabled: Boolean
 
+    /**
+     * Checks app is excluded from battery optimization or not
+     */
+    val isIgnoringOptimization: Boolean
+
     /**
      * Checks current battery status using platform [android.os.BatteryManager]
      */
diff --git a/app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt b/app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt
@@ -11,6 +11,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.BatteryManager
 import android.os.PowerManager
+import androidx.core.content.ContextCompat.getSystemService
 import com.nextcloud.utils.extensions.registerBroadcastReceiver
 import com.owncloud.android.datamodel.ReceiverFlag
 
@@ -27,6 +28,12 @@ internal class PowerManagementServiceImpl(
         }
     }
 
+    override val isIgnoringOptimization: Boolean
+        get() {
+            val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+            return powerManager.isIgnoringBatteryOptimizations(context.packageName)
+        }
+
     override val isPowerSavingEnabled: Boolean
         get() {
             return platformPowerManager.isPowerSaveMode
diff --git a/app/src/main/java/com/nextcloud/ui/component/AutoUploadWarningCardManager.kt b/app/src/main/java/com/nextcloud/ui/component/AutoUploadWarningCardManager.kt
@@ -0,0 +1,42 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.ui.component
+
+import android.content.Context
+import com.nextcloud.client.device.PowerManagementService
+import com.nextcloud.client.di.Injectable
+import com.nextcloud.utils.extensions.setVisibleIf
+import com.owncloud.android.R
+import com.owncloud.android.databinding.AutoUploadBatterySaverWarningBannerBinding
+import com.owncloud.android.utils.theme.ViewThemeUtils
+import javax.inject.Inject
+
+class AutoUploadWarningCardManager @Inject constructor(
+    private val powerManagementService: PowerManagementService,
+    private val viewThemeUtils: ViewThemeUtils,
+    private val context: Context
+) : Injectable {
+
+    fun bind(binding: AutoUploadBatterySaverWarningBannerBinding) {
+        val isBatterySaver = powerManagementService.isPowerSavingEnabled
+        val isIgnoringOptimization = powerManagementService.isIgnoringOptimization
+
+        binding.root.setVisibleIf(isBatterySaver || isIgnoringOptimization)
+
+        val messages = listOfNotNull(
+            if (isBatterySaver) context
+                .getString(R.string.auto_upload_battery_saver_mode_warning) else null,
+            if (isIgnoringOptimization) context
+                .getString(R.string.auto_upload_battery_ignore_optimization_mode_warning) else null
+        )
+
+        binding.message.text = messages.joinToString("\n")
+
+        viewThemeUtils.material.themeCardView(binding.root)
+    }
+}
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
@@ -33,6 +33,7 @@ import com.nextcloud.client.jobs.MediaFoldersDetectionWork
 import com.nextcloud.client.jobs.NotificationWork
 import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.preferences.SubFolderRule
+import com.nextcloud.ui.component.AutoUploadWarningCardManager
 import com.nextcloud.utils.BatteryOptimizationHelper
 import com.nextcloud.utils.extensions.getParcelableArgument
 import com.nextcloud.utils.extensions.isDialogFragmentReady
@@ -152,6 +153,9 @@ class SyncedFoldersActivity :
     @Inject
     lateinit var appInfo: AppInfo
 
+    @Inject
+    lateinit var autoUploadWarningCardManager: AutoUploadWarningCardManager
+
     lateinit var binding: SyncedFoldersLayoutBinding
     lateinit var adapter: SyncedFolderAdapter
 
@@ -246,6 +250,7 @@ class SyncedFoldersActivity :
         val gridWidth = resources.getInteger(R.integer.media_grid_width)
         val lightVersion = resources.getBoolean(R.bool.syncedFolder_light)
         adapter = SyncedFolderAdapter(
+            autoUploadWarningCardManager,
             lifecycleScope,
             this,
             clock,
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt
@@ -28,6 +28,7 @@ import com.nextcloud.client.jobs.upload.FileUploadEventBroadcaster
 import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.nextcloud.client.jobs.utils.UploadErrorNotificationManager
 import com.nextcloud.client.utils.Throttler
+import com.nextcloud.ui.component.AutoUploadWarningCardManager
 import com.nextcloud.utils.extensions.webDavParentPath
 import com.owncloud.android.R
 import com.owncloud.android.databinding.UploadListLayoutBinding
@@ -72,6 +73,9 @@ class UploadListActivity :
 
     @Inject lateinit var uploadFileOperationFactory: UploadFileOperationFactory
 
+    @Inject
+    lateinit var autoUploadWarningCardManager: AutoUploadWarningCardManager
+
     private var swipeListRefreshLayout: SwipeRefreshLayout? = null
     private var binding: UploadListLayoutBinding? = null
 
@@ -108,6 +112,7 @@ class UploadListActivity :
         adapterHelper = UploadListAdapterHelper(this)
         uploadListAdapter = UploadListAdapter(
             this,
+            autoUploadWarningCardManager,
             uploadsStorageManager,
             userAccountManager,
             connectivityService,
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt
@@ -25,6 +25,7 @@ import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.core.Clock
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.network.ConnectivityService
+import com.nextcloud.ui.component.AutoUploadWarningCardManager
 import com.nextcloud.utils.extensions.calculateScanInterval
 import com.nextcloud.utils.extensions.filterEnabledOrWithoutEnabledParent
 import com.nextcloud.utils.extensions.hasEnabledParent
@@ -55,6 +56,7 @@ import java.util.concurrent.TimeUnit
  */
 @Suppress("LongParameterList", "TooManyFunctions")
 class SyncedFolderAdapter(
+    private val autoUploadWarningCardManager: AutoUploadWarningCardManager,
     private val lifecycleScope: LifecycleCoroutineScope,
     private val context: Context,
     private val clock: Clock,
@@ -264,10 +266,7 @@ class SyncedFolderAdapter(
                 headerContainer.visibility = View.VISIBLE
 
                 if (section == 0) {
-                    autoUploadBatterySaverWarningCard.root.run {
-                        setVisibleIf(powerManagementService.isPowerSavingEnabled)
-                        viewThemeUtils.material.themeCardView(this)
-                    }
+                    autoUploadWarningCardManager.bind(autoUploadBatterySaverWarningCard)
                 }
 
                 val syncedFolder = filteredSyncFolderItems[section]
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/uploadList/UploadListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/uploadList/UploadListAdapter.kt
@@ -25,6 +25,7 @@ import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.network.ConnectivityService
+import com.nextcloud.ui.component.AutoUploadWarningCardManager
 import com.nextcloud.utils.extensions.getStatusText
 import com.nextcloud.utils.extensions.isLastResultConflictError
 import com.nextcloud.utils.extensions.setVisibleIf
@@ -67,6 +68,7 @@ import java.util.function.Consumer
 )
 class UploadListAdapter(
     private val activity: FileActivity,
+    private val autoUploadWarningCardManager: AutoUploadWarningCardManager,
     private val uploadsStorageManager: UploadsStorageManager,
     private val accountManager: UserAccountManager,
     private val connectivityService: ConnectivityService,
@@ -102,7 +104,7 @@ class UploadListAdapter(
 
         bindHeaderTitle(headerViewHolder, group, section)
         bindHeaderActionButton(headerViewHolder, group)
-        bindHeaderBatterySaverWarning(headerViewHolder)
+        autoUploadWarningCardManager.bind(holder.binding.autoUploadBatterySaverWarningCard)
         bindHeaderActionClickListener(headerViewHolder, group)
     }
 
@@ -130,12 +132,6 @@ class UploadListAdapter(
         holder.binding.uploadListAction.setImageResource(iconRes)
     }
 
-    private fun bindHeaderBatterySaverWarning(holder: HeaderViewHolder) {
-        holder.binding.autoUploadBatterySaverWarningCard.root
-            .setVisibleIf(powerManagementService.isPowerSavingEnabled)
-        viewThemeUtils.material.themeCardView(holder.binding.autoUploadBatterySaverWarningCard.root)
-    }
-
     private fun bindHeaderActionClickListener(holder: HeaderViewHolder, group: UploadListSection) {
         holder.binding.uploadListAction.setOnClickListener {
             when (group.type) {
diff --git a/app/src/main/res/layout/auto_upload_battery_saver_warning_banner.xml b/app/src/main/res/layout/auto_upload_battery_saver_warning_banner.xml
@@ -33,6 +33,7 @@
             app:tint="@color/log_level_warning" />
 
         <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/message"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1484,6 +1484,7 @@
     <string name="auto_upload_delete_dialog_title">Delete auto-upload folder?</string>
     <string name="auto_upload_delete_dialog_description">This will remove the folder and auto-upload configuration. Any unfinished uploads will be canceled.</string>
     <string name="auto_upload_battery_saver_mode_warning">Auto-upload is paused because Battery Saver is on.</string>
+    <string name="auto_upload_battery_ignore_optimization_mode_warning">Auto-upload might not work reliably because battery optimization is enabled for the Nextcloud app.</string>
     <string name="auto_upload_sub_folder_warning">This folder is already included in the parent folder’s sync, which may cause duplicate uploads</string>
     <string name="sync_anyway">Sync anyway</string>
     <string name="sync_duplication">Sync duplication</string>

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,9 @@ abstract class FileUploaderIT : AbstractOnServerIT() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`private val powerManagementServiceMock: PowerManagementService = object : PowerManagementService {`
	`46`	`+ override val isIgnoringOptimization: Boolean`
	`47`	`+ get() = true`
	`48`	`+`
`46`	`49`	`override val isPowerSavingEnabled: Boolean`
`47`	`50`	`get() = false`
`48`	`51`