Skip to content

Commit d3b8c91

Browse files
migrate CheckRemoteWipeRemoteOperation to NextcloudClient
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 3453a7a commit d3b8c91

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

app/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@
1313
package com.owncloud.android.ui.asynctasks;
1414

1515
import android.accounts.Account;
16+
import android.accounts.AccountManager;
17+
import android.accounts.AuthenticatorException;
18+
import android.accounts.OperationCanceledException;
1619
import android.os.AsyncTask;
1720

1821
import com.nextcloud.client.jobs.BackgroundJobManager;
22+
import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
1923
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
2024
import com.owncloud.android.lib.common.utils.Log_OC;
2125
import com.owncloud.android.lib.resources.users.CheckRemoteWipeRemoteOperation;
2226
import com.owncloud.android.ui.activity.FileActivity;
2327

28+
import java.io.IOException;
2429
import java.lang.ref.WeakReference;
2530

2631
public class CheckRemoteWipeTask extends AsyncTask<Void, Void, Boolean> {
@@ -45,7 +50,15 @@ protected Boolean doInBackground(Void... voids) {
4550
return Boolean.FALSE;
4651
}
4752

48-
RemoteOperationResult checkWipeResult = new CheckRemoteWipeRemoteOperation().execute(account, fileActivity);
53+
String password;
54+
try {
55+
AccountManager am = AccountManager.get(fileActivity);
56+
password = am.blockingGetAuthToken(account, AccountTypeUtils.getAuthTokenTypePass(account.type), false);
57+
} catch (AuthenticatorException | IOException | OperationCanceledException e) {
58+
return Boolean.FALSE;
59+
}
60+
61+
RemoteOperationResult<Void> checkWipeResult = new CheckRemoteWipeRemoteOperation(password).executeNextcloudClient(account, fileActivity);
4962

5063
if (checkWipeResult.isSuccess()) {
5164
backgroundJobManager.startAccountRemovalJob(account.name, true);

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
buildscript {
1212
ext {
13-
androidLibraryVersion ="2f798d3f4b0b18458af0c917eb39ad8ca45e5b55"
13+
androidLibraryVersion ="095acc94c947d14c88646c184ec0ff445eaa6cd5"
1414
androidCommonLibraryVersion = "0.29.0"
1515
androidPluginVersion = '8.13.0'
1616
androidxMediaVersion = "1.5.1"

0 commit comments

Comments
 (0)