feature/1475-delete-uploaded-files: apply to current user or all users, added users in report

Signed-off-by: daniele-verducci <daniele.verducci@nextcloud.com>

Author: daniele-verducci

app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadLocalDeletionWorker.kt

@@ -59,6 +59,7 @@ class AutoUploadLocalDeletionWorker(
         val syncedFolders = syncedFolderIDs
             .map { syncedFolderProvider.getSyncedFolderByID(it) }
 
+        var users = HashSet<String>()
         var filesPreserved = 0L
         var foldersAnalyzed = 0L
         var filesRemoved = 0L
@@ -70,6 +71,7 @@ class AutoUploadLocalDeletionWorker(
             .filter { FileUtil.isFolderWritable(File(it.localPath)) }
             .forEach {
                 val sharedFolderOwner = userAccountManager.getUser(it.account).get()
+                users.add(sharedFolderOwner.accountName)
                 val fileDataStorageManager = FileDataStorageManager(sharedFolderOwner, context.contentResolver)
                 val op = DeleteUploadedFileOperation(
                     it,
@@ -93,6 +95,7 @@ class AutoUploadLocalDeletionWorker(
         val runTimeMs = System.currentTimeMillis() - timeStarted
         showNotification(
             createSuccessNotification(
+                users.size,
                 foldersAnalyzed,
                 filesRemoved,
                 filesPreserved,
@@ -102,13 +105,14 @@ class AutoUploadLocalDeletionWorker(
         )
         Log_OC.d(
             TAG,
-            "Success: foldersAnalyzed=$foldersAnalyzed, filesPreserved=$filesPreserved, " +
+            "Success: users=$users, foldersAnalyzed=$foldersAnalyzed, filesPreserved=$filesPreserved, " +
                 "filesRemoved=$filesRemoved, spaceFreed=$spaceFreed bytes, runTimeMs=$runTimeMs"
         )
         return Result.success()
     }
 
     private fun createSuccessNotification(
+        users: Int,
         foldersRemoved: Long,
         filesRemoved: Long,
         filesPreserved: Long,
@@ -120,6 +124,7 @@ class AutoUploadLocalDeletionWorker(
             DisplayUtils.bytesToHumanReadable(spaceFreed),
             filesRemoved,
             foldersRemoved,
+            users,
             DisplayUtils.unixTimeDurationToHumanReadable(context, timeElapsed)
         )
         if (filesPreserved > 0) {

app/src/main/java/com/owncloud/android/operations/upload/DeleteUploadedFileOperation.kt

@@ -35,7 +35,7 @@ class DeleteUploadedFileOperation(
 
     @Suppress("ReturnCount")
     suspend fun run(): RemoteOperationResult<Stats> {
-        Log_OC.d(TAG, "Analyzing folder ${syncedFolder.remotePath}")
+        Log_OC.d(TAG, "Analyzing folder ${syncedFolder.remotePath} from user ${syncedFolder.account}")
 
         // Obtain synced folder data
         val folder = storageManager.getFileByRemotePath(syncedFolder.remotePath)

app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt

@@ -610,19 +610,25 @@ class SyncedFoldersActivity :
             null,
             R.string.autoupload_delete_uploaded_all_dialog_title,
             R.drawable.selector_trashbin,
-            R.string.common_ok,
-            R.string.common_cancel,
-            -1
+            R.string.autoupload_delete_uploaded_all_dialog_button_all_users,
+            R.string.autoupload_delete_uploaded_all_dialog_button_current_user,
+            R.string.common_cancel
         )
         dialog.isCancelable = false
         dialog.setOnConfirmationListener(object : ConfirmationDialogFragment.ConfirmationDialogFragmentListener {
             override fun onConfirmation(callerTag: String?) {
                 FilesSyncHelper.startLocalDeletionForEnabledSyncedFolders(syncedFolderProvider, backgroundJobManager)
             }
 
-            override fun onNeutral(callerTag: String?) = Unit
+            override fun onCancel(callerTag: String?) {
+                FilesSyncHelper.startLocalDeletionForEnabledSyncedFolders(
+                    syncedFolderProvider,
+                    backgroundJobManager,
+                    user.get()
+                )
+            }
 
-            override fun onCancel(callerTag: String?) = Unit
+            override fun onNeutral(callerTag: String?) = Unit
         })
 
         showDialog(dialog, SYNCED_FOLDER_DELETE_ALL_UPLOADED_DIALOG_TAG)

app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.kt

@@ -9,6 +9,7 @@
  */
 package com.owncloud.android.utils
 
+import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.jobs.BackgroundJobManager
@@ -56,11 +57,26 @@ object FilesSyncHelper {
 
     @JvmStatic
     fun startLocalDeletionForEnabledSyncedFolders(provider: SyncedFolderProvider, manager: BackgroundJobManager) {
-        Log_OC.d(TAG, "start local deletion worker for each enabled folder")
+        Log_OC.d(TAG, "Start local deletion worker for each enabled folder by any user")
 
         manager.locallyDeleteAutoUploadedFiles(provider.syncedFolders)
     }
 
+    @JvmStatic
+    fun startLocalDeletionForEnabledSyncedFolders(
+        provider: SyncedFolderProvider,
+        manager: BackgroundJobManager,
+        user: User
+    ) {
+        Log_OC.d(TAG, "start local deletion worker for each enabled folder under user ${user.accountName}")
+
+        manager.locallyDeleteAutoUploadedFiles(
+            provider.syncedFolders.filter {
+                it.account.equals(user.accountName)
+            }
+        )
+    }
+
     @JvmStatic
     fun startLocalDeletionForSyncedFolder(folder: SyncedFolder, manager: BackgroundJobManager) {
         Log_OC.d(TAG, "start local deletion worker for folder ${folder.localPath}")

app/src/main/res/values/strings.xml

@@ -886,15 +886,17 @@
     <string name="autoupload_delete_uploaded_notif_started_title">Started to locally delete already uploaded files in background</string>
     <string name="autoupload_delete_uploaded_notif_ended_title">Locally deleted already uploaded files</string>
     <string name="autoupload_delete_uploaded_notif_error_title">Unable to locally delete already uploaded files</string>
-    <string name="autoupload_delete_uploaded_notif_ended_content">Freed up %1$s removing %2$d files across %3$d folders. The operation required %4$s.</string>
+    <string name="autoupload_delete_uploaded_notif_ended_content">Freed up %1$s removing %2$d files across %3$d folders from %4$d users. The operation required %5$s.</string>
     <string name="autoupload_delete_uploaded_notif_ended_content_preserved">%1$d files have been left in place because not (yet) uploaded or modified.</string>
     <string name="synced_folders_configure_folders">Configure folders</string>
 
     <string name="autoupload_delete_uploaded_dialog_title">Locally delete uploaded files</string>
     <string name="autoupload_delete_uploaded_dialog_description">All the files already uploaded to the cloud will be removed from the current device</string>
 
     <string name="autoupload_delete_uploaded_all_dialog_title">Locally delete uploaded files for all auto upload folders</string>
-    <string name="autoupload_delete_uploaded_all_dialog_description">All the files already uploaded to the cloud will be removed from the current device for all the autoupload folders from all the configured users</string>
+    <string name="autoupload_delete_uploaded_all_dialog_description">All the files already uploaded to the cloud will be removed from the current device for all the autoupload folders</string>
+    <string name="autoupload_delete_uploaded_all_dialog_button_all_users">From all users</string>
+    <string name="autoupload_delete_uploaded_all_dialog_button_current_user">From current user</string>
 
     <string name="empty" translatable="false"></string>
     <string name="test_server_button">Test server connection</string>