From ff362f1c76b92e7884c0cfc661fd60126a2b1519 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 3 Feb 2026 13:13:02 +0100 Subject: [PATCH] fix(manage-space-activity): app in foreground Signed-off-by: alperozturk96 --- .../com/nextcloud/client/jobs/metadata/MetadataWorker.kt | 5 +++++ .../com/owncloud/android/ui/activity/ManageSpaceActivity.kt | 5 +++++ .../com/owncloud/android/ui/adapter/OCFileListAdapter.java | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/app/src/main/java/com/nextcloud/client/jobs/metadata/MetadataWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/metadata/MetadataWorker.kt index 057268c7287f..5221bbe3d663 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/metadata/MetadataWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/metadata/MetadataWorker.kt @@ -35,6 +35,11 @@ class MetadataWorker(private val context: Context, params: WorkerParameters, pri return Result.failure() } + if (user.isAnonymous) { + Log_OC.w(TAG, "user is anonymous cannot start metadata worker") + return Result.failure() + } + val storageManager = FileDataStorageManager(user, context.contentResolver) val currentDir = storageManager.getFileByDecryptedRemotePath(filePath) if (currentDir == null) { diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt index 510d5be66381..4279b2f2a066 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt @@ -11,6 +11,7 @@ import android.os.Bundle import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope +import androidx.work.WorkManager import com.google.android.material.snackbar.Snackbar import com.nextcloud.android.common.ui.util.extensions.applyEdgeToEdgeWithSystemBarPadding import com.nextcloud.client.account.UserAccountManager @@ -61,6 +62,9 @@ class ManageSpaceActivity : @Suppress("MagicNumber") private suspend fun clearData() { withContext(Dispatchers.IO) { + // cancel all works + WorkManager.getInstance(this@ManageSpaceActivity).cancelAllWork() + val lockPref = preferences.lockPreference val passCodeEnable = SettingsActivity.LOCK_PASSCODE == lockPref var passCodeDigits = arrayOfNulls(4) @@ -87,6 +91,7 @@ class ManageSpaceActivity : val result = clearApplicationData() withContext(Dispatchers.Main) { if (result) { + finishAffinity() finishAndRemoveTask() exitProcess(0) } else { diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java index db46f3dc607c..dbeda9c9c1ac 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java +++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java @@ -840,6 +840,10 @@ public void swapDirectory( return; } + if (userId == null) { + return; + } + helper.prepareFileList(directory, adapterDataProvider, onlyOnDevice,