Skip to content

migrate CheckRemoteWipeRemoteOperation to NextcloudClient #15856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

migrate CheckRemoteWipeRemoteOperation to NextcloudClient #15856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Void, Void, Boolean> {
Expand All @@ -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<Void> checkWipeResult = new CheckRemoteWipeRemoteOperation(password).executeNextcloudClient(account, fileActivity);

if (checkWipeResult.isSuccess()) {
backgroundJobManager.startAccountRemovalJob(account.name, true);
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
buildscript {
ext {
androidLibraryVersion ="2f798d3f4b0b18458af0c917eb39ad8ca45e5b55"
androidLibraryVersion ="095acc94c947d14c88646c184ec0ff445eaa6cd5"
androidCommonLibraryVersion = "0.29.0"
androidPluginVersion = '8.13.0'
androidxMediaVersion = "1.5.1"
Expand Down
Loading