|
|
@ -24,6 +24,7 @@ import com.todoroo.astrid.core.SortHelper;
|
|
|
|
import com.todoroo.astrid.dao.Database;
|
|
|
|
import com.todoroo.astrid.dao.Database;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import javax.inject.Inject;
|
|
|
|
import javax.inject.Inject;
|
|
|
|
|
|
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
import org.tasks.data.CaldavTask;
|
|
|
|
import org.tasks.data.CaldavTask;
|
|
|
|
import org.tasks.data.GoogleTask;
|
|
|
|
import org.tasks.data.GoogleTask;
|
|
|
|
import org.tasks.data.LimitOffsetDataSource;
|
|
|
|
import org.tasks.data.LimitOffsetDataSource;
|
|
|
@ -40,8 +41,10 @@ public class TaskListViewModel extends ViewModel {
|
|
|
|
private LiveData<PagedList<Task>> tasks;
|
|
|
|
private LiveData<PagedList<Task>> tasks;
|
|
|
|
private Filter filter;
|
|
|
|
private Filter filter;
|
|
|
|
|
|
|
|
|
|
|
|
public LiveData<PagedList<Task>> getTasks(Filter filter, Property<?>[] properties) {
|
|
|
|
public LiveData<PagedList<Task>> getTasks(@NotNull Filter filter, Property<?>[] properties) {
|
|
|
|
if (tasks == null || !filter.equals(this.filter)) {
|
|
|
|
if (tasks == null
|
|
|
|
|
|
|
|
|| !filter.equals(this.filter)
|
|
|
|
|
|
|
|
|| !filter.getSqlQuery().equals(this.filter.getSqlQuery())) {
|
|
|
|
this.filter = filter;
|
|
|
|
this.filter = filter;
|
|
|
|
tasks = getLiveData(properties);
|
|
|
|
tasks = getLiveData(properties);
|
|
|
|
}
|
|
|
|
}
|
|
|
|