gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate ShareOperationWorker from requery to room

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-07-23 16:05:07 +02:00
parent 2dfd4731af
commit 24ddaf4ec4
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.java
View File

@ -25,10 +25,10 @@ import android.util.Log;
import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.api.NcApi;
import com.nextcloud.talk.application.NextcloudTalkApplication; 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.ApiUtils;
import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.bundle.BundleKeys;
import com.nextcloud.talk.utils.database.user.UserUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -47,13 +47,16 @@ import io.reactivex.schedulers.Schedulers;
@AutoInjector(NextcloudTalkApplication.class) @AutoInjector(NextcloudTalkApplication.class)
public class ShareOperationWorker extends Worker { public class ShareOperationWorker extends Worker {
@Inject @Inject
UserUtils userUtils; UserManager userManager;
@Inject @Inject
NcApi ncApi; NcApi ncApi;
private final String TAG = "ShareOperationWorker"; private final String TAG = "ShareOperationWorker";
private long userId; private long userId;
private UserEntity operationsUser; private User operationsUser;
private String roomToken; private String roomToken;
private List<String> filesArray = new ArrayList<>(); private List<String> filesArray = new ArrayList<>();
private String credentials; private String credentials;
@ -68,12 +71,11 @@ public class ShareOperationWorker extends Worker {
roomToken = data.getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN()); roomToken = data.getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN());
metaData = data.getString(BundleKeys.INSTANCE.getKEY_META_DATA()); metaData = data.getString(BundleKeys.INSTANCE.getKEY_META_DATA());
Collections.addAll(filesArray, data.getStringArray(BundleKeys.INSTANCE.getKEY_FILE_PATHS())); 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()); credentials = ApiUtils.getCredentials(operationsUser.getUsername(), operationsUser.getToken());
baseUrl = operationsUser.getBaseUrl(); baseUrl = operationsUser.getBaseUrl();
} }
@NonNull @NonNull
@Override @Override
public Result doWork() { public Result doWork() {
@ -89,12 +91,12 @@ public class ShareOperationWorker extends Worker {
.blockingSubscribe(new Observer<Void>() { .blockingSubscribe(new Observer<Void>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
// unused atm
} }
@Override @Override
public void onNext(Void aVoid) { public void onNext(Void aVoid) {
// unused atm
} }
@Override @Override
@ -104,7 +106,7 @@ public class ShareOperationWorker extends Worker {
@Override @Override
public void onComplete() { public void onComplete() {
// unused atm
} }
}); });
} }