Bug fix

tom5079 · Sep 14, 2020 · b907d36 · b907d36
1 parent fee2803
commit b907d36
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,7 +21,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 59
-        versionName "5.0.2-hotfix1"
+        versionName "5.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 59,
-      "versionName": "5.0.2-hotfix1",
+      "versionName": "5.0.3",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

diff --git a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -339,7 +339,7 @@ class DownloadService : Service() {
 
         if (isCompleted(galleryID)) {
             if (DownloadManager.getInstance(this@DownloadService)
-                    .getDownloadFolder(galleryID) != null)
+                    .getDownloadFolder(galleryID) != null )
                 Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
 
             notificationManager.cancel(galleryID)

diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -410,6 +410,7 @@ class ReaderActivity : BaseActivity() {
                         animateDownloadFAB(false)
                     } else {
                         downloadManager.addDownloadFolder(galleryID)
+                        DownloadService.download(context, galleryID, true)
                         animateDownloadFAB(true)
                     }
                 }
@@ -419,8 +420,7 @@ class ReaderActivity : BaseActivity() {
         with(reader_fab_retry) {
             setImageResource(R.drawable.refresh)
             setOnClickListener {
-                downloader?.cancel(galleryID)
-                downloader?.download(galleryID)
+                DownloadService.download(context, galleryID)
             }
         }
 

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
@@ -104,8 +104,10 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
 
         val folder = downloadFolder.getChild(name)
 
-        if (!folder.exists())
-            folder.mkdir()
+        if (folder.exists())
+            return
+
+        folder.mkdir()
 
         downloadFolderMap[galleryID] = folder.name
 

diff --git a/app/src/main/java/xyz/quaver/pupil/util/misc.kt b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -93,14 +93,14 @@ fun GalleryBlock.formatDownloadFolder(): String =
         formatMap.entries.fold(it) { str, (k, v) ->
             str.replace(k, v.invoke(this), true)
         }
-    }.replace("/", "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "")
 
 fun GalleryBlock.formatDownloadFolderTest(format: String): String =
     format.let {
         formatMap.entries.fold(it) { str, (k, v) ->
             str.replace(k, v.invoke(this), true)
         }
-    }.replace("/", "")
+    }.replace(Regex("""[*\\|"?><:/]"""), "")
 
 val Reader.requestBuilders: List<Request.Builder>
     get() {

diff --git a/app/src/main/res/drawable/menu.xml b/app/src/main/res/drawable/menu.xml
@@ -1,4 +1,4 @@
 <!--drawable/menu.xml-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M3 6h18v2H3V6m0 5h18v2H3v-2m0 5h18v2H3v-2z"/>
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M3 6h18v2H3V6m0 5h18v2H3v-2m0 5h18v2H3v-2z"/>
 </vector>