From d3b8c9112cd0ced00d03bad383477bfbfbd9b009 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 27 Oct 2025 15:42:14 +0100 Subject: [PATCH] migrate CheckRemoteWipeRemoteOperation to NextcloudClient Signed-off-by: tobiasKaminsky --- .../ui/asynctasks/CheckRemoteWipeTask.java | 15 ++++++++++++++- build.gradle | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java index a5d1db9f2633..28358d69e67b 100644 --- a/app/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java +++ b/app/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java @@ -13,14 +13,19 @@ package com.owncloud.android.ui.asynctasks; import android.accounts.Account; +import android.accounts.AccountManager; +import android.accounts.AuthenticatorException; +import android.accounts.OperationCanceledException; import android.os.AsyncTask; import com.nextcloud.client.jobs.BackgroundJobManager; +import com.owncloud.android.lib.common.accounts.AccountTypeUtils; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.users.CheckRemoteWipeRemoteOperation; import com.owncloud.android.ui.activity.FileActivity; +import java.io.IOException; import java.lang.ref.WeakReference; public class CheckRemoteWipeTask extends AsyncTask { @@ -45,7 +50,15 @@ protected Boolean doInBackground(Void... voids) { return Boolean.FALSE; } - RemoteOperationResult checkWipeResult = new CheckRemoteWipeRemoteOperation().execute(account, fileActivity); + String password; + try { + AccountManager am = AccountManager.get(fileActivity); + password = am.blockingGetAuthToken(account, AccountTypeUtils.getAuthTokenTypePass(account.type), false); + } catch (AuthenticatorException | IOException | OperationCanceledException e) { + return Boolean.FALSE; + } + + RemoteOperationResult checkWipeResult = new CheckRemoteWipeRemoteOperation(password).executeNextcloudClient(account, fileActivity); if (checkWipeResult.isSuccess()) { backgroundJobManager.startAccountRemovalJob(account.name, true); diff --git a/build.gradle b/build.gradle index 6747709617b7..32a0722a88fb 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ */ buildscript { ext { - androidLibraryVersion ="2f798d3f4b0b18458af0c917eb39ad8ca45e5b55" + androidLibraryVersion ="095acc94c947d14c88646c184ec0ff445eaa6cd5" androidCommonLibraryVersion = "0.29.0" androidPluginVersion = '8.13.0' androidxMediaVersion = "1.5.1"