gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 18:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use blocking subscribe in workers

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-10 07:12:30 +02:00
parent b55a57ceab
commit 3cb3506f56
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java
View File

@ -50,7 +50,6 @@ import autodagger.AutoInjector;
import io.reactivex.CompletableObserver; import io.reactivex.CompletableObserver;
import io.reactivex.Observer; import io.reactivex.Observer;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.JavaNetCookieJar; import okhttp3.JavaNetCookieJar;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import retrofit2.Retrofit; import retrofit2.Retrofit;
@ -89,7 +88,7 @@ public class AccountRemovalWorker extends Worker {
ncApi.unregisterDeviceForNotificationsWithNextcloud(ApiUtils.getCredentials(userEntity.getUsername(), ncApi.unregisterDeviceForNotificationsWithNextcloud(ApiUtils.getCredentials(userEntity.getUsername(),
userEntity.getToken()), ApiUtils.getUrlNextcloudPush(userEntity.getBaseUrl())) userEntity.getToken()), ApiUtils.getUrlNextcloudPush(userEntity.getBaseUrl()))
.subscribe(new Observer<GenericOverall>() { .blockingSubscribe(new Observer<GenericOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
@ -108,7 +107,7 @@ public class AccountRemovalWorker extends Worker {
ncApi.unregisterDeviceForNotificationsWithProxy ncApi.unregisterDeviceForNotificationsWithProxy
(ApiUtils.getCredentials(userEntity.getUsername(), (ApiUtils.getCredentials(userEntity.getUsername(),
userEntity.getToken()), ApiUtils.getUrlPushProxy(), queryMap) userEntity.getToken()), ApiUtils.getUrlPushProxy(), queryMap)
.subscribe(new Observer<Void>() { .blockingSubscribe(new Observer<Void>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
@ -132,8 +131,7 @@ public class AccountRemovalWorker extends Worker {
} }
} }
userUtils.deleteUser(userEntity.getId()).subscribe(new userUtils.deleteUser(userEntity.getId()).subscribe(new CompletableObserver() {
CompletableObserver() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
@ -214,6 +212,7 @@ public class AccountRemovalWorker extends Worker {
}); });
} }
} }
return Result.SUCCESS; return Result.SUCCESS;
} }
} }

6
app/src/main/java/com/nextcloud/talk/jobs/CapabilitiesWorker.java
View File

@ -46,7 +46,6 @@ import androidx.work.Worker;
import autodagger.AutoInjector; import autodagger.AutoInjector;
import io.reactivex.Observer; import io.reactivex.Observer;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.JavaNetCookieJar; import okhttp3.JavaNetCookieJar;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import retrofit2.Retrofit; import retrofit2.Retrofit;
@ -75,8 +74,7 @@ public class CapabilitiesWorker extends Worker {
null, null, null, null,
null, null, null, internalUserEntity.getId(), null, null, null, internalUserEntity.getId(),
LoganSquare.serialize(capabilitiesOverall.getOcs().getData().getCapabilities()), null) LoganSquare.serialize(capabilitiesOverall.getOcs().getData().getCapabilities()), null)
.subscribeOn(Schedulers.newThread()) .blockingSubscribe(new Observer<UserEntity>() {
.subscribe(new Observer<UserEntity>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
@ -132,7 +130,7 @@ public class CapabilitiesWorker extends Worker {
ncApi.getCapabilities(ApiUtils.getCredentials(internalUserEntity.getUsername(), ncApi.getCapabilities(ApiUtils.getCredentials(internalUserEntity.getUsername(),
internalUserEntity.getToken()), ApiUtils.getUrlForCapabilities(internalUserEntity.getBaseUrl())) internalUserEntity.getToken()), ApiUtils.getUrlForCapabilities(internalUserEntity.getBaseUrl()))
.retry(3) .retry(3)
.subscribe(new Observer<CapabilitiesOverall>() { .blockingSubscribe(new Observer<CapabilitiesOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {

4
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -106,7 +106,7 @@ public class NotificationWorker extends Worker {
ncApi.getRoom(ApiUtils.getCredentials(userEntity.getUserId(), ncApi.getRoom(ApiUtils.getCredentials(userEntity.getUserId(),
userEntity.getToken()), ApiUtils.getRoom(userEntity.getBaseUrl(), userEntity.getToken()), ApiUtils.getRoom(userEntity.getBaseUrl(),
intent.getExtras().getString(BundleKeys.KEY_ROOM_TOKEN))) intent.getExtras().getString(BundleKeys.KEY_ROOM_TOKEN)))
.subscribe(new Observer<RoomOverall>() { .blockingSubscribe(new Observer<RoomOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
@ -145,7 +145,7 @@ public class NotificationWorker extends Worker {
ncApi.getNotification(ApiUtils.getCredentials(userEntity.getUserId(), ncApi.getNotification(ApiUtils.getCredentials(userEntity.getUserId(),
userEntity.getToken()), ApiUtils.getUrlForNotificationWithId(userEntity.getBaseUrl(), userEntity.getToken()), ApiUtils.getUrlForNotificationWithId(userEntity.getBaseUrl(),
Long.toString(decryptedPushMessage.getNotificationId()))) Long.toString(decryptedPushMessage.getNotificationId())))
.subscribe(new Observer<NotificationOverall>() { .blockingSubscribe(new Observer<NotificationOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {