From 83801feee9b9e2d73cc63e2239ade1c67cbfdf02 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Wed, 9 Sep 2020 11:23:22 +0900
Subject: [PATCH] Bug fix

---
 app/build.gradle                                             | 4 ++--
 app/release/output-metadata.json                             | 2 +-
 app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt  | 5 +----
 .../java/xyz/quaver/pupil/util/downloader/DownloadManager.kt | 2 +-
 build.gradle                                                 | 1 -
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bcd3e77b..5a2c802d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 57
-        versionName "5.0-beta6"
+        versionName "5.0-beta7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -100,7 +100,7 @@ dependencies {
     implementation ("xyz.quaver:libpupil:1.5") {
         exclude group: 'org.jetbrains.kotlinx', module: 'kotlinx-serialization-core-jvm'
     }
-    implementation "xyz.quaver:documentfilex:0.2.14"
+    implementation "xyz.quaver:documentfilex:0.2.15"
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test:rules:1.3.0'
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 8912078e..a3a1b639 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 57,
-      "versionName": "5.0-beta6",
+      "versionName": "5.0-beta7",
       "enabled": true,
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
index 9053fa45..87267404 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
@@ -34,10 +34,7 @@ import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.io.FileX
-import xyz.quaver.io.util.getChild
-import xyz.quaver.io.util.readBytes
-import xyz.quaver.io.util.readText
-import xyz.quaver.io.util.writeBytes
+import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.util.Preferences
 
diff --git a/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt b/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
index 64ab2585..20997615 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
@@ -124,7 +124,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
 
         downloadFolderMap[galleryID]?.let {
             kotlin.runCatching {
-                downloadFolder.getChild(it).delete()
+                downloadFolder.getChild(it).deleteRecursively()
                 downloadFolderMap.remove(galleryID)
 
                 downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
diff --git a/build.gradle b/build.gradle
index b77bf651..b535d3a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        mavenLocal()
         maven { url "https://jitpack.io" }
         maven { url 'https://guardian.github.com/maven/repo-releases' }
     }