mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-29 21:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use more Compat utilities (#5786)

Browse Source 
* Use ActivityCompat.recreate

* Use more KTX extensions

* Use PackageInfoCompat.getLongVersionCode

* Remove unnecessary compat usages
This commit is contained in:
Taco
2021-08-27 16:33:12 -04:00
committed by GitHub
parent edcfa28b0b
commit 12a9d0575d
20 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
View File

@@ -14,6 +14,7 @@ import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.int
import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive
import kotlinx.serialization.json.long
import uy.kohesive.injekt.injectLazy
import java.util.Date
@@ -67,7 +68,7 @@ internal class ExtensionGithubApi {
val pkgName = element.jsonObject["pkg"]!!.jsonPrimitive.content
val apkName = element.jsonObject["apk"]!!.jsonPrimitive.content
val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
val versionCode = element.jsonObject["code"]!!.jsonPrimitive.int
val versionCode = element.jsonObject["code"]!!.jsonPrimitive.long
val lang = element.jsonObject["lang"]!!.jsonPrimitive.content
val nsfw = element.jsonObject["nsfw"]!!.jsonPrimitive.int == 1
val icon = "${REPO_URL_PREFIX}icon/${apkName.replace(".apk", ".png")}"

8
app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt
View File

@@ -7,7 +7,7 @@ sealed class Extension {
abstract val name: String
abstract val pkgName: String
abstract val versionName: String
abstract val versionCode: Int
abstract val versionCode: Long
abstract val lang: String?
abstract val isNsfw: Boolean
@@ -15,7 +15,7 @@ sealed class Extension {
override val name: String,
override val pkgName: String,
override val versionName: String,
override val versionCode: Int,
override val versionCode: Long,
override val lang: String,
override val isNsfw: Boolean,
val pkgFactory: String?,
@@ -29,7 +29,7 @@ sealed class Extension {
override val name: String,
override val pkgName: String,
override val versionName: String,
override val versionCode: Int,
override val versionCode: Long,
override val lang: String,
override val isNsfw: Boolean,
val apkName: String,
@@ -40,7 +40,7 @@ sealed class Extension {
override val name: String,
override val pkgName: String,
override val versionName: String,
override val versionCode: Int,
override val versionCode: Long,
val signatureHash: String,
override val lang: String? = null,
override val isNsfw: Boolean = false

3
app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt
View File

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.Context
import android.content.pm.PackageInfo
import android.content.pm.PackageManager
import androidx.core.content.pm.PackageInfoCompat
import dalvik.system.PathClassLoader
import eu.kanade.tachiyomi.annotations.Nsfw
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -103,7 +104,7 @@ internal object ExtensionLoader {
val extName = pkgManager.getApplicationLabel(appInfo).toString().substringAfter("Tachiyomi: ")
val versionName = pkgInfo.versionName
val versionCode = pkgInfo.versionCode
val versionCode = PackageInfoCompat.getLongVersionCode(pkgInfo)
if (versionName.isNullOrEmpty()) {
val exception = Exception("Missing versionName for extension $extName")