From 1faf6cb208027df481ef4781de18795c4d4c751f Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sun, 2 Jun 2019 01:04:16 +0900
Subject: [PATCH] Small fix

---
 .../java/xyz/quaver/pupil/MainActivity.kt     |  1 -
 .../java/xyz/quaver/pupil/ReaderActivity.kt   | 44 ++++++++++---------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
index bbe0c7d3..d35b14b4 100644
--- a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
@@ -573,7 +573,6 @@ class MainActivity : AppCompatActivity() {
                                             }
 
                                             if (next is LinearLayout) {
-                                                Log.d("Pupil", "hmm...")
                                                 val icon = next.findViewById<ImageView>(R.id.icon_next)
                                                 next.layoutParams.height = 1
                                                 icon.layoutParams.height = 1
diff --git a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
index a6cd8cc3..c92e65b0 100644
--- a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
@@ -190,27 +190,31 @@ class ReaderActivity : AppCompatActivity() {
             onNotifyChangedHandler = { notify ->
                 val fab = reader_fab_download
 
-                if (notify) {
-                    val icon = AnimatedVectorDrawableCompat.create(this, R.drawable.ic_downloading)
-                    icon?.registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                        override fun onAnimationEnd(drawable: Drawable?) {
-                            if (downloader.download)
-                                fab.post {
-                                    icon.start()
-                                    fab.labelText = getString(R.string.reader_fab_download_cancel)
-                                }
-                            else
-                                fab.post {
-                                    fab.setImageResource(R.drawable.ic_download)
-                                    fab.labelText = getString(R.string.reader_fab_download)
-                                }
-                        }
-                    })
+                runOnUiThread {
+                    if (notify) {
+                        val icon = AnimatedVectorDrawableCompat.create(this, R.drawable.ic_downloading)
+                        icon?.registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
+                            override fun onAnimationEnd(drawable: Drawable?) {
+                                if (downloader.download)
+                                    fab.post {
+                                        icon.start()
+                                        fab.labelText = getString(R.string.reader_fab_download_cancel)
+                                    }
+                                else
+                                    fab.post {
+                                        fab.setImageResource(R.drawable.ic_download)
+                                        fab.labelText = getString(R.string.reader_fab_download)
+                                    }
+                            }
+                        })
 
-                    fab.setImageDrawable(icon)
-                    icon?.start()
-                } else {
-                    fab.setImageResource(R.drawable.ic_download)
+                        fab.setImageDrawable(icon)
+                        icon?.start()
+                    } else {
+                        runOnUiThread {
+                            fab.setImageResource(R.drawable.ic_download)
+                        }
+                    }
                 }
             }
         }