Bug fix

2020-10-14 18:36:36 +09:00
parent 7f02284285
commit 331cbec5f1
12 changed files with 48 additions and 31 deletions
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 *Pupil, Hitomi.la viewer for Android*  

 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.5-hotfix1/Pupil-v5.1.5-hotfix1.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.5/Pupil-v5.1.5-hotfix1.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.5-hotfix2/Pupil-v5.1.5-hotfix2.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.5-hotfix2/Pupil-v5.1.5-hotfix2.apk)
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  

 # Features
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@ android {
        minSdkVersion 16
        targetSdkVersion 30
        versionCode 63
-        versionName "5.1.5-hotfix1"
+        versionName "5.1.5-hotfix2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
@@ -77,8 +77,8 @@ android {
 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0-M1"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0"
    
    implementation "androidx.appcompat:appcompat:1.2.0"
    implementation "androidx.activity:activity-ktx:1.2.0-beta01"
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,7 +11,7 @@
      "type": "SINGLE",
      "filters": [],
      "versionCode": 63,
-      "versionName": "5.1.5-hotfix1",
+      "versionName": "5.1.5-hotfix2",
      "outputFile": "app-release.apk"
    }
  ]
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -18,7 +18,10 @@

 package xyz.quaver.pupil

-import android.app.*
+import android.app.Application
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt
@@ -24,10 +24,7 @@ import android.util.AttributeSet
 import android.util.Log
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.types.Tags
@@ -71,10 +68,12 @@ class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSe
        maxChipSize = attr.getInt(R.styleable.TagChipGroup_maxTag, Defaults.maxChipSize)
    }

+    private var refreshJob: Job? = null
    fun refresh() {
+        refreshJob?.cancel()
        this.removeAllViews()

-        CoroutineScope(Dispatchers.Main).launch {
+        refreshJob = CoroutineScope(Dispatchers.Main).launch {
            tags.take(maxChipSize).map {
                CoroutineScope(Dispatchers.Default).async {
                    TagChip(context, it).apply {
--- a/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt
@@ -24,7 +24,7 @@ import kotlinx.serialization.json.Json
 import java.io.File
 import java.util.*

-class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = Collections.synchronizedSet(mutableSetOf())) : MutableSet<T> by set {
+class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {

    @Suppress("UNCHECKED_CAST")
    @OptIn(ExperimentalSerializationApi::class)
@@ -39,8 +39,8 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
        load()
    }

+    @Synchronized
    fun load() {
-        synchronized(this) {
        set.clear()
        kotlin.runCatching {
            Json.decodeFromString(serializer, file.readText())
@@ -48,15 +48,14 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
            set.addAll(it)
        }
    }
-    }

+    @Synchronized
    @OptIn(ExperimentalSerializationApi::class)
    fun save() {
-        synchronized(this) {
        file.writeText(Json.encodeToString(serializer, set.toList()))
    }
-    }

+    @Synchronized
    override fun add(element: T): Boolean {
        load()

@@ -67,6 +66,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
        }
    }

+    @Synchronized
    override fun addAll(elements: Collection<T>): Boolean {
        load()

@@ -77,6 +77,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
        }
    }

+    @Synchronized
    override fun remove(element: T): Boolean {
        load()

@@ -85,6 +86,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
        }
    }

+    @Synchronized
    override fun clear() {
        set.clear()
        save()
--- a/app/src/main/java/xyz/quaver/pupil/util/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -55,11 +55,13 @@ fun cleanCache(context: Context) = CoroutineScope(Dispatchers.IO).launch {
            while (cacheSize.invoke() > limit/2) {
                val caches = cacheFolder.list() ?: return@withLock

-                (histories.toList().firstOrNull {
+                synchronized(histories) {
+                    (histories.firstOrNull {
                        caches.contains(it.toString()) && !downloadManager.isDownloading(it)
                    } ?: return@withLock).let {
                        Cache.delete(context, it)
                    }
                }
            }
+    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/translation.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/translation.kt
@@ -42,11 +42,13 @@ var translations: Map<String, String> = run {
@Suppress("BlockingMethodInNonBlockingContext")
 fun updateTranslations() = CoroutineScope(Dispatchers.IO).launch {
    translations = emptyMap()
+    kotlin.runCatching {
        translations = Json.decodeFromString<Map<String, String>>(client.newCall(
            Request.Builder()
                .url(contentURL + "${Preferences["tag_language", ""]}.json")
                .build()
        ).execute().also { if (it.code() != 200) return@launch }.body()?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() }
+    }
 }

 fun getAvailableLanguages(): List<String> {
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -154,4 +154,5 @@
    <string name="settings_cache_unlimited">制限なし</string>
    <string name="settings_tag_language">タグ言語</string>
    <string name="settings_tag_language_message">Githubにて翻訳に参加できます</string>
+    <string name="settings_concurrent_download">並列ダウンロード</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -154,4 +154,5 @@
    <string name="settings_cache_unlimited">무제한</string>
    <string name="settings_tag_language">태그 언어</string>
    <string name="settings_tag_language_message">Github에서 번역에 참여하세요</string>
+    <string name="settings_concurrent_download">병렬 다운로드</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -176,6 +176,7 @@

    <string name="settings_miscellaneous_title">Miscellaneous</string>
    <string name="settings_tag_language">Tag Language</string>
+    <string name="settings_concurrent_download">Concurrent Download</string>
    <string name="settings_tag_language_message">Participate in translation on Github</string>
    <string name="settings_mirror_summary">Load images from mirrors</string>
    <string name="settings_proxy_title">Proxy</string>