From c242aa625ace6f19a0104d1e0d48ba01ac27a584 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Thu, 13 Jun 2019 21:18:26 +0900
Subject: [PATCH] Bug fix

---
 app/build.gradle                                     | 2 ++
 app/release/output.json                              | 2 +-
 app/src/main/java/xyz/quaver/pupil/Pupil.kt          | 3 ++-
 app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt | 5 +++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 702199c1..46f2ce9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,7 @@ android {
         versionCode 16
         versionName "2.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -36,6 +37,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1'
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.11.0"
+    implementation 'com.android.support:multidex:1.0.3'
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.preference:preference:1.1.0-beta01'
diff --git a/app/release/output.json b/app/release/output.json
index 456cc06e..0cc69cca 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":15,"versionName":"2.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":16,"versionName":"2.9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/xyz/quaver/pupil/Pupil.kt b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
index d40eef41..add8d659 100644
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -8,10 +8,11 @@ import android.content.Context
 import android.os.Build
 import android.preference.PreferenceManager
 import androidx.core.content.ContextCompat
+import androidx.multidex.MultiDexApplication
 import xyz.quaver.pupil.util.Histories
 import java.io.File
 
-class Pupil : Application() {
+class Pupil : MultiDexApplication() {
 
     lateinit var histories: Histories
     lateinit var downloads: Histories
diff --git a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
index bc379688..84e9378b 100644
--- a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
@@ -72,6 +72,11 @@ class ReaderActivity : AppCompatActivity() {
 
         handleIntent(intent)
 
+        if (!::galleryBlock.isInitialized) {
+            finish()
+            return
+        }
+
         supportActionBar?.title = galleryBlock.title
         supportActionBar?.setDisplayHomeAsUpEnabled(false)