Merge branch 'mihonapp:main' into main

mihonapp · Feb 3, 2025 · ef468b8 · ef468b8
2 parents 8dbb49f + d592ab2
commit ef468b8
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co
 
 ### Fixed
 - Fix MAL `main_picture` nullability breaking search if a result doesn't have a cover set ([@MajorTanya](https://github.com/MajorTanya)) ([#1618](https://github.com/mihonapp/mihon/pull/1618))
+- Fix Bangumi and MAL tracking 401 errors due to Mihon sending expired credentials ([@MajorTanya](https://github.com/MajorTanya)) ([#1681](https://github.com/mihonapp/mihon/pull/1681), [#1682](https://github.com/mihonapp/mihon/pull/1682))
+- Fix certain Infinix devices being unable to use any "Open link in browser" actions, including tracker setup ([@MajorTanya](https://github.com/MajorTanya)) ([#1684](https://github.com/mihonapp/mihon/pull/1684))
 
 ### Other
 - Add zoned "Current time" to debug info and include year & timezone in logcat output ([@MajorTanya](https://github.com/MajorTanya)) ([#1672](https://github.com/mihonapp/mihon/pull/1672))

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiInterceptor.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiInterceptor.kt
@@ -21,12 +21,13 @@ class BangumiInterceptor(private val bangumi: Bangumi) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalRequest = chain.request()
 
-        val currAuth = oauth ?: throw Exception("Not authenticated with Bangumi")
+        var currAuth: BGMOAuth = oauth ?: throw Exception("Not authenticated with Bangumi")
 
         if (currAuth.isExpired()) {
             val response = chain.proceed(BangumiApi.refreshTokenRequest(currAuth.refreshToken!!))
             if (response.isSuccessful) {
-                newAuth(json.decodeFromString<BGMOAuth>(response.body.string()))
+                currAuth = json.decodeFromString<BGMOAuth>(response.body.string())
+                newAuth(currAuth)
             } else {
                 response.close()
             }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/dto/BGMOAuth.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/dto/BGMOAuth.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.data.track.bangumi.dto
 
+import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -10,6 +11,7 @@ data class BGMOAuth(
     @SerialName("token_type")
     val tokenType: String,
     @SerialName("created_at")
+    @EncodeDefault
     val createdAt: Long = System.currentTimeMillis() / 1000,
     @SerialName("expires_in")
     val expiresIn: Long,

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/dto/MALOAuth.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/dto/MALOAuth.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.data.track.myanimelist.dto
 
+import kotlinx.serialization.EncodeDefault
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -14,10 +15,11 @@ data class MALOAuth(
     @SerialName("expires_in")
     val expiresIn: Long,
     @SerialName("created_at")
-    val createdAt: Long = System.currentTimeMillis(),
+    @EncodeDefault
+    val createdAt: Long = System.currentTimeMillis() / 1000,
 ) {
     // Assumes expired a minute earlier
-    private val adjustedExpiresIn: Long = (expiresIn - 60) * 1000
+    private val adjustedExpiresIn: Long = (expiresIn - 60)
 
-    fun isExpired() = createdAt + adjustedExpiresIn < System.currentTimeMillis()
+    fun isExpired() = createdAt + adjustedExpiresIn < System.currentTimeMillis() / 1000
 }
diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt
@@ -62,11 +62,25 @@ object DeviceUtil {
         }
     }
 
+    /**
+     * A list of package names that may be incorrectly resolved as usable browsers by
+     * the system.
+     *
+     * If these are resolved for [android.content.Intent.ACTION_VIEW], it prevents the
+     * system from opening a proper browser or any usable app .
+     *
+     * Some of them may only be present on certain manufacturer's devices.
+     */
     val invalidDefaultBrowsers = listOf(
         "android",
+        // Honor
         "com.hihonor.android.internal.app",
+        // Huawei
         "com.huawei.android.internal.app",
+        // Lenovo
         "com.zui.resolver",
+        // Infinix
+        "com.transsion.resolver",
     )
 
     /**

diff --git a/gradle/kotlinx.versions.toml b/gradle/kotlinx.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin_version = "2.1.0"
+kotlin_version = "2.1.10"
 serialization_version = "1.8.0"
 xml_serialization_version = "0.90.3"
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-aboutlib_version = "11.4.0"
+aboutlib_version = "11.5.0"
 leakcanary = "2.14"
 moko = "0.24.4"
 okhttp_version = "5.0.0-alpha.14"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME