Bug fix

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,24 +39,23 @@ 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())
-            }.onSuccess {
-                set.addAll(it)
-            }
+        set.clear()
+        kotlin.runCatching {
+            Json.decodeFromString(serializer, file.readText())
+        }.onSuccess {
+            set.addAll(it)
         }
     }
 
+    @Synchronized
     @OptIn(ExperimentalSerializationApi::class)
     fun save() {
-        synchronized(this) {
-            file.writeText(Json.encodeToString(serializer, set.toList()))
-        }
+        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()

app/src/main/java/xyz/quaver/pupil/util/file.kt

@@ -55,10 +55,12 @@ fun cleanCache(context: Context) = CoroutineScope(Dispatchers.IO).launch {
             while (cacheSize.invoke() > limit/2) {
                 val caches = cacheFolder.list() ?: return@withLock
 
-                (histories.toList().firstOrNull {
-                    caches.contains(it.toString()) && !downloadManager.isDownloading(it)
-                } ?: return@withLock).let {
-                    Cache.delete(context, it)
+                synchronized(histories) {
+                    (histories.firstOrNull {
+                        caches.contains(it.toString()) && !downloadManager.isDownloading(it)
+                    } ?: return@withLock).let {
+                        Cache.delete(context, it)
+                    }
                 }
             }
     }

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()
-    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() }
+    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> {