From e33b16b9460ac72b94d32643efdd60a845c034ea Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 27 May 2020 11:36:01 -0500
Subject: [PATCH] Minor collapsible group changes

---
 .../main/java/com/todoroo/astrid/activity/TaskListFragment.kt | 2 +-
 app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt   | 3 ++-
 .../java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
index ae92d6f79..d3c36f836 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
@@ -239,7 +239,7 @@ class TaskListFragment : InjectingFragment(), OnRefreshListener, Toolbar.OnMenuI
         } else if (recyclerAdapter !is DragAndDropRecyclerAdapter) {
             setAdapter(
                     DragAndDropRecyclerAdapter(
-                            taskAdapter, recyclerView, viewHolderFactory, this, tasks as MutableList, taskDao, preferences))
+                            taskAdapter, recyclerView, viewHolderFactory, this, tasks, taskDao, preferences))
             return
         }
         recyclerAdapter!!.submitList(tasks)
diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
index cf66a6351..d2cf4a4f2 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
@@ -8,6 +8,7 @@ package com.todoroo.astrid.adapter
 import com.todoroo.astrid.data.Task
 import org.tasks.data.TaskContainer
 import java.util.*
+import kotlin.collections.HashSet
 
 open class TaskAdapter {
     private val selected = HashSet<Long>()
@@ -33,7 +34,7 @@ open class TaskAdapter {
 
     fun clearSelections() = selected.clear()
 
-    fun getCollapsed(): ArrayList<Long> = ArrayList(collapsed)
+    fun getCollapsed(): MutableSet<Long> = HashSet(collapsed)
 
     fun setCollapsed(groups: LongArray?) {
         clearCollapsed()
diff --git a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
index 1250acb02..ba7157a2c 100644
--- a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
+++ b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
@@ -28,7 +28,7 @@ class DragAndDropRecyclerAdapter(
         private val recyclerView: RecyclerView,
         viewHolderFactory: ViewHolderFactory,
         private val taskList: TaskListFragment,
-        tasks: MutableList<TaskContainer>,
+        tasks: List<TaskContainer>,
         taskDao: TaskDao,
         preferences: Preferences) : TaskListRecyclerAdapter(adapter, viewHolderFactory, taskList, taskDao, preferences) {
     private var list: SectionedDataSource
@@ -69,7 +69,7 @@ class DragAndDropRecyclerAdapter(
 
     override fun submitList(list: List<TaskContainer>) {
         disposables.add(
-                Single.fromCallable { SectionedDataSource(list as MutableList, disableHeaders, preferences.sortMode, adapter.getCollapsed().toMutableSet()) }
+                Single.fromCallable { SectionedDataSource(list, disableHeaders, preferences.sortMode, adapter.getCollapsed()) }
                         .subscribeOn(Schedulers.computation())
                         .subscribe(publishSubject::onNext))
     }