Same for view group holder.

sdelaysam · May 4, 2021 · af8ea63 · af8ea63
1 parent f934025
commit af8ea63
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/adapter-viewgroup/src/main/java/org/sdelaysam/configurator/viewgroup/BasicViewHolder.kt b/adapter-viewgroup/src/main/java/org/sdelaysam/configurator/viewgroup/BasicViewHolder.kt
@@ -6,7 +6,7 @@ import androidx.annotation.CallSuper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.cancelChildren
 import org.sdelaysam.configurator.RequiresCoroutineScope
 import org.sdelaysam.configurator.adapter.AdapterEntry
 
@@ -21,9 +21,11 @@ abstract class BasicViewHolder(val view: View) {
 
     @CallSuper
     open fun onBind(data: AdapterEntry) {
-        coroutineScope?.cancel()
+        coroutineScope?.coroutineContext?.cancelChildren()
         if (data is RequiresCoroutineScope) {
-            coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+            if (coroutineScope == null) {
+                coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+            }
             data.setCoroutineScope(coroutineScope!!)
         } else {
             coroutineScope = null
@@ -32,8 +34,7 @@ abstract class BasicViewHolder(val view: View) {
 
     @CallSuper
     open fun onRecycled() {
-        coroutineScope?.cancel()
-        coroutineScope = null
+        coroutineScope?.coroutineContext?.cancelChildren()
     }
 
     interface Factory {