UI update

Added sort by popularity functionality
Added auto update

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

@@ -102,55 +102,59 @@ class GalleryDownloader(
         initNotification()
 
         reader = CoroutineScope(Dispatchers.IO).async {
-            download = _notify
-            val json = Json(JsonConfiguration.Stable)
-            val serializer = Reader.serializer()
+            try {
+                download = _notify
+                val json = Json(JsonConfiguration.Stable)
+                val serializer = Reader.serializer()
 
-            //Check cache
-            val cache = File(getCachedGallery(this@GalleryDownloader, galleryID), "reader.json")
+                //Check cache
+                val cache = File(getCachedGallery(this@GalleryDownloader, galleryID), "reader.json")
 
-            if (cache.exists()) {
-                val cached = json.parse(serializer, cache.readText())
+                if (cache.exists()) {
+                    val cached = json.parse(serializer, cache.readText())
 
-                if (cached.readerItems.isNotEmpty()) {
-                    useHiyobi = when {
-                        cached.readerItems[0].url.contains("hitomi.la") -> false
-                        else -> true
+                    if (cached.readerItems.isNotEmpty()) {
+                        useHiyobi = when {
+                            cached.readerItems[0].url.contains("hitomi.la") -> false
+                            else -> true
+                        }
+
+                        onReaderLoadedHandler?.invoke(cached)
+
+                        return@async cached
                     }
-
-                    onReaderLoadedHandler?.invoke(cached)
-
-                    return@async cached
                 }
-            }
 
-            //Cache doesn't exist. Load from internet
-            val reader = when {
-                useHiyobi -> {
-                    xyz.quaver.hiyobi.getReader(galleryID).let {
-                        when {
-                            it.readerItems.isEmpty() -> {
-                                useHiyobi = false
-                                getReader(galleryID)
+                //Cache doesn't exist. Load from internet
+                val reader = when {
+                    useHiyobi -> {
+                        xyz.quaver.hiyobi.getReader(galleryID).let {
+                            when {
+                                it.readerItems.isEmpty() -> {
+                                    useHiyobi = false
+                                    getReader(galleryID)
+                                }
+                                else -> it
                             }
-                            else -> it
                         }
                     }
+                    else -> {
+                        getReader(galleryID)
+                    }
                 }
-                else -> {
-                    getReader(galleryID)
+
+                if (reader.readerItems.isNotEmpty()) {
+                    //Save cache
+                    if (cache.parentFile?.exists() == false)
+                        cache.parentFile!!.mkdirs()
+
+                    cache.writeText(json.stringify(serializer, reader))
                 }
+
+                reader
+            } catch (e: Exception) {
+                Reader("", listOf())
             }
-
-            if (reader.readerItems.isNotEmpty()) {
-                //Save cache
-                if (cache.parentFile?.exists() == false)
-                    cache.parentFile!!.mkdirs()
-
-                cache.writeText(json.stringify(serializer, reader))
-            }
-
-            reader
         }
     }
 
@@ -160,8 +164,10 @@ class GalleryDownloader(
         downloadJob = CoroutineScope(Dispatchers.Default).launch {
             val reader = reader!!.await()
 
-            if (reader.readerItems.isEmpty())
-                onErrorHandler?.invoke(IOException("Couldn't retrieve Reader"))
+            if (reader.readerItems.isEmpty()) {
+                onErrorHandler?.invoke(IOException(getString(R.string.unable_to_connect)))
+                return@launch
+            }
 
             val list = ArrayList<String>()
 

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

@@ -19,6 +19,7 @@
 package xyz.quaver.pupil.util
 
 import kotlinx.serialization.json.*
+import xyz.quaver.pupil.BuildConfig
 import java.net.URL
 
 fun getReleases(url: String) : JsonArray {
@@ -31,26 +32,27 @@ fun getReleases(url: String) : JsonArray {
     }
 }
 
-fun checkUpdate(url: String, currentVersion: String) : JsonObject? {
+fun checkUpdate(url: String) : JsonObject? {
     val releases = getReleases(url)
 
     if (releases.isEmpty())
         return null
 
-    val latestVersion = releases[0].jsonObject["tag_name"]?.content
+    return releases.firstOrNull {
+        if (BuildConfig.PRERELEASE) {
+            BuildConfig.VERSION_NAME != it.jsonObject["tag_name"]?.content
+        } else {
+            it.jsonObject["prerelease"]?.boolean == false &&
+                    BuildConfig.VERSION_NAME != (it.jsonObject["tag_name"]?.content ?: "")
+        }
+    }?.jsonObject
+}
 
-    return when {
-        currentVersion.split('-').size == 1 -> {
-            when {
-                currentVersion != latestVersion -> releases[0].jsonObject
-                else -> null
-            }
-        }
-        else -> {
-            when {
-                (currentVersion.split('-')[0] == latestVersion) -> releases[0].jsonObject
-                else -> null
-            }
-        }
+fun getApkUrl(releases: JsonObject) : Pair<String?, String?>? {
+    releases["assets"]?.jsonArray?.forEach {
+        if (Regex("Pupil-v(\\d+\\.)+\\d+\\.apk").matches(it.jsonObject["name"]?.content ?: ""))
+            return Pair(it.jsonObject["browser_download_url"]?.content, it.jsonObject["name"]?.content)
     }
+
+    return null
 }