diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java index 59ac42bd2..115201a70 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java @@ -26,7 +26,12 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement @Override public Observable> getTasks(String taskType, String userID) { - return realm.where(Task.class).equalTo("type", taskType).equalTo("userId", userID).findAllSorted("position").sort("dateCreated", Sort.DESCENDING).asObservable() + return realm.where(Task.class) + .equalTo("type", taskType) + .equalTo("userId", userID) + .findAllSorted("position") + .sort("dateCreated", Sort.DESCENDING) + .asObservable() .filter(RealmResults::isLoaded); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java index 10efbfe2f..f48c52281 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java @@ -74,8 +74,6 @@ public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsF .flatMap(Observable::from) .filter(task -> task.type.equals(Task.TYPE_TODO) || task.isDisplayedActive(customDayStart)) .toList() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) .subscribe(tasks -> { taskList = tasks; this.reloadData = false;