Source settings

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

@@ -28,27 +28,24 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.kodein.di.DIAware
-import org.kodein.di.android.di
-import org.kodein.di.instance
+import org.kodein.di.android.closestDI
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.sources.AnySource
 
 class DownloadManager constructor(context: Context) : ContextWrapper(context), DIAware {
 
-    override val di by di(context)
+    override val di by closestDI(context)
 
     private val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
 
     val downloadFolder: FileX
-        get() = {
-            kotlin.runCatching {
-                FileX(this, Preferences.get<String>("download_folder"))
-            }.getOrElse {
-                Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
-                defaultDownloadFolder
-            }
-        }.invoke()
+        get() = kotlin.runCatching {
+            FileX(this, Preferences.get<String>("download_folder"))
+        }.getOrElse {
+            Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
+            defaultDownloadFolder
+        }
 
     private var prevDownloadFolder: FileX? = null
     private var downloadFolderMapInstance: MutableMap<String, String>? = null
@@ -57,21 +54,19 @@ class DownloadManager constructor(context: Context) : ContextWrapper(context), D
         get() {
             if (prevDownloadFolder != downloadFolder) {
                 prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = {
+                downloadFolderMapInstance = run {
                     val file = downloadFolder.getChild(".download")
-
                     val data = if (file.exists())
                         kotlin.runCatching {
-                            file.readText()?.let { Json.decodeFromString<MutableMap<String, String>>(it) }
+                            file.readText()?.let<String, MutableMap<String, String>> { Json.decodeFromString(it) }
                         }.onFailure { file.delete() }.getOrNull()
                     else
                         null
-
-                    data ?: {
+                    data ?: run {
                         file.createNewFile()
-                        mutableMapOf<String, String>()
-                    }.invoke()
-                }.invoke()
+                        mutableMapOf()
+                    }
+                }
             }
 
             return downloadFolderMapInstance ?: mutableMapOf()

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

@@ -23,11 +23,11 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.sendBlocking
+import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.coroutineScope
 import okhttp3.*
 import org.kodein.di.DIAware
-import org.kodein.di.android.di
+import org.kodein.di.android.closestDI
 import org.kodein.di.instance
 import java.io.File
 import java.io.IOException
@@ -35,7 +35,7 @@ import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
 class ImageCache(context: Context) : DIAware {
-    override val di by di(context)
+    override val di by closestDI(context)
 
     private val client: OkHttpClient by instance()
 
@@ -115,7 +115,7 @@ class ImageCache(context: Context) : DIAware {
                             file.createNewFile()
 
                         body.byteStream().copyTo(file.outputStream()) { bytes, _ ->
-                            channel.sendBlocking(bytes / body.contentLength().toFloat() * 100)
+                            channel.trySendBlocking(bytes / body.contentLength().toFloat() * 100)
                         }
                     }
 

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

@@ -45,7 +45,7 @@ fun updateTranslations() = CoroutineScope(Dispatchers.IO).launch {
     kotlin.runCatching {
         translations = Json.decodeFromString<Map<String, String>>(client.newCall(
                 Request.Builder()
-                    .url(contentURL + "${Preferences["tag_translation", ""].let { if (it.isEmpty()) Locale.getDefault().language else it }}.json")
+                    .url(contentURL + "${Preferences["hitomi.tag_translation", ""].let { if (it.isEmpty()) Locale.getDefault().language else it }}.json")
                     .build()
             ).execute().also { if (it.code != 200) return@launch }.body?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() }
     }