Fix initial crash

2 files changed, 13 insertions, 11 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
index 95322c1c..eaef17e5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
@@ -23,8 +23,6 @@ import com.pitchedapps.frost.contracts.MainActivityContract
 import com.pitchedapps.frost.contracts.MainFabContract
 import com.pitchedapps.frost.views.FrostRecyclerView
 import io.reactivex.disposables.Disposable
-import kotlinx.coroutines.channels.ReceiveChannel
-import kotlinx.coroutines.channels.SendChannel
 
 /**
  * Created by Allan Wang on 2017-11-07.
@@ -103,9 +101,9 @@ interface RecyclerContentContract {
     fun bind(recyclerView: FrostRecyclerView)
 
     /**
-     * Completely handle data reloading
-     * The progress function allows optional emission of progress values (between 0 and 100).
-     * This can be called from any thread.
+     * Completely handle data reloading, within a non-ui thread
+     * The progress function allows optional emission of progress values (between 0 and 100)
+     * and can be called from any thread.
      * Returns [true] for success, [false] otherwise
      */
     suspend fun reload(progress: (Int) -> Unit): Boolean
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
index 98c8f750..ddb9fde6 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
@@ -30,6 +30,7 @@ import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.frostJsoup
 import com.pitchedapps.frost.views.FrostRecyclerView
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.withContext
 
 /**
@@ -55,14 +56,17 @@ abstract class RecyclerFragment<T, Item : IItem<*, *>> : BaseFragment(), Recycle
         } catch (e: Exception) {
             null
         }
-        if (data == null) {
-            valid = false
+        if (!isActive)
             return false
+        return withContext(Dispatchers.Main) {
+            if (data == null) {
+                valid = false
+                return@withContext false
+            } else {
+                adapter.setNewList(data)
+                return@withContext true
+            }
         }
-        withContext(Dispatchers.Main) {
-            adapter.setNewList(data)
-        }
-        return true
     }
 
     protected abstract suspend fun reloadImpl(progress: (Int) -> Unit): List<T>?