From bb6fadc1827509339d2426e85295dc716f016cb4 Mon Sep 17 00:00:00 2001
From: Pupil <tom5079@naver.com>
Date: Sun, 16 Feb 2020 20:11:20 +0900
Subject: [PATCH] Fixed unending loading screen

---
 .../main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt | 9 ---------
 app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt  | 8 +++++++-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
index 907950bb..7eda96d9 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -83,15 +83,6 @@ class ReaderAdapter(private val context: Context,
 
     var onItemClickListener : ((Int) -> (Unit))? = null
 
-    init {
-        CoroutineScope(Dispatchers.IO).launch {
-            reader = Cache(context).getReader(galleryID)
-            launch(Dispatchers.Main) {
-                notifyDataSetChanged()
-            }
-        }
-    }
-
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
index bde9a89e..fb91da5c 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -254,9 +254,15 @@ class ReaderActivity : AppCompatActivity() {
                 reader_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
 
                 if (title == getString(R.string.reader_loading)) {
-                    val reader = (reader_recyclerview.adapter as ReaderAdapter).reader
+                    val reader = Cache(this@ReaderActivity).getReaderOrNull(galleryID)
 
                     if (reader != null) {
+
+                        with (reader_recyclerview.adapter as ReaderAdapter) {
+                            this.reader = reader
+                            notifyDataSetChanged()
+                        }
+
                         title = reader.title
                         menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${reader.galleryInfo.size}"