Fix Injekt TypeReference crash and harden null safety in handlers

- proguard: add -keep for all FullTypeReference subclasses so R8 cannot
  remove the anonymous objects that carry generic type info; this definitively
  fixes the IllegalArgumentException in SettingsEhScreen / RecommendsScreen
- GlobalExceptionHandler: null-safe extra read instead of !! unwrap
- BilibiliHandler: use firstOrNull() + error message instead of [0]!!
- AzukiHandler: safe JSON navigation with mapIndexedNotNull (no more !! chains)
- ComikeyHandler: safe og:url lookup and safe readingOrder navigation
- GalleryAdder: replace manga!!/id!! double-unwrap with explicit early returns

Author: ig4e

app/proguard-rules.pro

@@ -3,6 +3,12 @@
 # Keep generic type signatures required by Injekt (FullTypeReference uses Signature attribute)
 -keepattributes Signature
 
+# Keep all anonymous FullTypeReference subclasses so R8 cannot remove them.
+# Injekt.get<T>() creates `object : FullTypeReference<T>() {}` at every call site;
+# if R8 removes those anonymous classes the Signature attribute is gone and
+# FullTypeReference.<init> throws IllegalArgumentException at runtime.
+-keep class * extends uy.kohesive.injekt.api.FullTypeReference { *; }
+
 -keep,allowoptimization class eu.kanade.**
 -keep,allowoptimization class tachiyomi.**
 -keep,allowoptimization class yokai.**

app/src/main/java/eu/kanade/tachiyomi/ui/crash/GlobalExceptionHandler.kt

@@ -70,8 +70,9 @@ class GlobalExceptionHandler private constructor(
 
         fun getThrowableFromIntent(intent: Intent): Throwable? {
             return try {
-                Json.decodeFromString(ThrowableSerializer, intent.getStringExtra(INTENT_EXTRA)!!)
-            } catch (e: Exception) {
+                val extra = intent.getStringExtra(INTENT_EXTRA) ?: return null
+                Json.decodeFromString(ThrowableSerializer, extra)
+            } catch (e: Throwable) {
                 Logger.e(e) { "Wasn't able to retrieve throwable from intent" }
                 null
             }

app/src/main/java/exh/GalleryAdder.kt

@@ -140,14 +140,18 @@ class GalleryAdder {
             }
 
             // Fetch and update manga details from source
-            val newMangaDetails = retry(retry) { source.getMangaDetails(manga!!) }
-            manga!!.copyFrom(newMangaDetails)
-            manga!!.initialized = true
-            updateManga.await(manga!!.toMangaUpdate())
-            manga = getManga.awaitById(manga!!.id!!)!!
+            // manga is non-null here: either found in DB or inserted and re-fetched above
+            val nonNullManga = manga ?: return GalleryAddEvent.Fail.Error(url, "Manga not found (Gallery: $url)")
+            val newMangaDetails = retry(retry) { source.getMangaDetails(nonNullManga) }
+            nonNullManga.copyFrom(newMangaDetails)
+            nonNullManga.initialized = true
+            updateManga.await(nonNullManga.toMangaUpdate())
+            val mangaId = nonNullManga.id ?: return GalleryAddEvent.Fail.Error(url, "Manga has no ID (Gallery: $url)")
+            manga = getManga.awaitById(mangaId)
+                ?: return GalleryAddEvent.Fail.Error(url, "Failed to reload manga after update (Gallery: $url)")
 
             if (fav) {
-                updateManga.await(MangaUpdate(id = manga.id!!, favorite = true))
+                updateManga.await(MangaUpdate(id = manga.id ?: mangaId, favorite = true))
                 manga.favorite = true
             }
 

app/src/main/java/exh/md/handlers/AzukiHandler.kt

@@ -32,11 +32,16 @@ class AzukiHandler(currentClient: OkHttpClient, userAgent: String) {
     }
 
     fun pageListParse(response: Response): List<Page> {
-        return Json.parseToJsonElement(response.body.string())
-            .jsonObject["pages"]!!
-            .jsonArray.mapIndexed { index, element ->
-                val url = element.jsonObject["image_wm"]!!.jsonObject["webp"]!!.jsonArray[1].jsonObject["url"]!!.jsonPrimitive.content
-                Page(index, url, url)
-            }
+        val pages = Json.parseToJsonElement(response.body.string())
+            .jsonObject["pages"]
+            ?.jsonArray ?: throw Exception("Azuki: missing 'pages' in response")
+        return pages.mapIndexedNotNull { index, element ->
+            val url = element.jsonObject["image_wm"]
+                ?.jsonObject?.get("webp")
+                ?.jsonArray?.getOrNull(1)
+                ?.jsonObject?.get("url")
+                ?.jsonPrimitive?.content ?: return@mapIndexedNotNull null
+            Page(index, url, url)
+        }
     }
 }

app/src/main/java/exh/md/handlers/BilibiliHandler.kt

@@ -181,7 +181,8 @@ class BilibiliHandler(currentClient: OkHttpClient) {
 
     private fun imageUrlParse(response: Response): String {
         val result = response.parseAs<BilibiliResultDto<List<BilibiliPageDto>>>()
-        val page = result.data!![0]
+        val page = result.data?.firstOrNull()
+            ?: throw Exception("Bilibili: empty image token response")
 
         return "${page.url}?token=${page.token}"
     }

app/src/main/java/exh/md/handlers/ComikeyHandler.kt

@@ -36,7 +36,8 @@ class ComikeyHandler(cloudflareClient: OkHttpClient, userAgent: String) {
 
     suspend fun getMangaId(mangaUrl: String): Int {
         val response = client.newCall(GET("$baseUrl/read/$mangaUrl")).awaitSuccess()
-        val url = response.asJsoup().selectFirst("meta[property=og:url]")!!.attr("content")
+        val url = response.asJsoup().selectFirst("meta[property=og:url]")?.attr("content")
+            ?: throw Exception("Comikey: could not find og:url meta tag")
         return url.trimEnd('/').substringAfterLast('/').toInt()
     }
 
@@ -55,11 +56,12 @@ class ComikeyHandler(cloudflareClient: OkHttpClient, userAgent: String) {
     }
 
     fun pageListParse(response: Response): List<Page> {
-        return Json.parseToJsonElement(response.body.string())
-            .jsonObject["readingOrder"]!!
-            .jsonArray.mapIndexed { index, element ->
-                val url = element.jsonObject["href"]!!.jsonPrimitive.content
-                Page(index, url, url)
-            }
+        val order = Json.parseToJsonElement(response.body.string())
+            .jsonObject["readingOrder"]
+            ?.jsonArray ?: throw Exception("Comikey: missing 'readingOrder' in response")
+        return order.mapIndexedNotNull { index, element ->
+            val url = element.jsonObject["href"]?.jsonPrimitive?.content ?: return@mapIndexedNotNull null
+            Page(index, url, url)
+        }
     }
 }