sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 04:39:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash

Browse source 
# Conflicts:
#	Habitica/build.gradle
This commit is contained in:
Phillip Thelen 2020-01-23 17:45:19 +01:00
parent a5f5e98aad
commit 7bcc4062b4
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
View file

@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.models.tasks.Task
import io.realm.Case
import io.realm.OrderedRealmCollection
import io.realm.RealmQuery
import io.realm.Sort
import java.util.*
class TaskFilterHelper {
@ -115,6 +116,9 @@ class TaskFilterHelper {
Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
}
}
if (activeFilter != Task.FILTER_DATED) {
query = query.sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
}
}
return query
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
View file

@ -146,7 +146,7 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
if (taskFilterHelper != null) {
val query = taskFilterHelper.createQuery(unfilteredData)
if (query != null) {
updateData(query.sort("position").findAll())
updateData(query.findAll())
}
}
}