From 24ddaf4ec40ea2e242f4400ca19b4fef8c52ab44 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 23 Jul 2022 16:05:07 +0200 Subject: [PATCH] Migrate ShareOperationWorker from requery to room Signed-off-by: Andy Scherzinger --- .../talk/jobs/ShareOperationWorker.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java index ee99a3cde..3ef10f3b9 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java @@ -25,10 +25,10 @@ import android.util.Log; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; -import com.nextcloud.talk.models.database.UserEntity; +import com.nextcloud.talk.data.user.model.User; +import com.nextcloud.talk.users.UserManager; import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.bundle.BundleKeys; -import com.nextcloud.talk.utils.database.user.UserUtils; import java.util.ArrayList; import java.util.Collections; @@ -47,13 +47,16 @@ import io.reactivex.schedulers.Schedulers; @AutoInjector(NextcloudTalkApplication.class) public class ShareOperationWorker extends Worker { + @Inject - UserUtils userUtils; + UserManager userManager; + @Inject NcApi ncApi; + private final String TAG = "ShareOperationWorker"; private long userId; - private UserEntity operationsUser; + private User operationsUser; private String roomToken; private List filesArray = new ArrayList<>(); private String credentials; @@ -68,12 +71,11 @@ public class ShareOperationWorker extends Worker { roomToken = data.getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN()); metaData = data.getString(BundleKeys.INSTANCE.getKEY_META_DATA()); Collections.addAll(filesArray, data.getStringArray(BundleKeys.INSTANCE.getKEY_FILE_PATHS())); - operationsUser = userUtils.getUserWithId(userId); + operationsUser = userManager.getUserWithId(userId).blockingGet(); credentials = ApiUtils.getCredentials(operationsUser.getUsername(), operationsUser.getToken()); baseUrl = operationsUser.getBaseUrl(); } - @NonNull @Override public Result doWork() { @@ -89,12 +91,12 @@ public class ShareOperationWorker extends Worker { .blockingSubscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - + // unused atm } @Override public void onNext(Void aVoid) { - + // unused atm } @Override @@ -104,7 +106,7 @@ public class ShareOperationWorker extends Worker { @Override public void onComplete() { - + // unused atm } }); }