prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Koitharu
2025-01-19 09:51:01 +02:00
parent 74fe786c00 503bff292c
commit 54bb02937d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt
View File

@@ -21,6 +21,7 @@ import org.koitharu.kotatsu.parsers.util.await
import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
import org.koitharu.kotatsu.parsers.util.parseJsonArray
import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrNull
import javax.inject.Inject
import javax.inject.Singleton
@@ -85,8 +86,8 @@ class AppUpdateRepository @Inject constructor(
}
@Suppress("KotlinConstantConditions")
fun isUpdateSupported(): Boolean {
return BuildConfig.BUILD_TYPE != BUILD_TYPE_RELEASE || appValidator.isOriginalApp
suspend fun isUpdateSupported(): Boolean {
return BuildConfig.BUILD_TYPE != BUILD_TYPE_RELEASE || appValidator.isOriginalApp.getOrNull() == true
}
suspend fun getCurrentVersionChangelog(): String? {

2
app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/model/Cover.kt
View File

@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.favourites.domain.model
import org.koitharu.kotatsu.core.model.MangaSource
data class Cover(
val url: String,
val url: String?,
val source: String,
) {
val mangaSource by lazy { MangaSource(source) }

2
gradle/libs.versions.toml
View File

@@ -31,7 +31,7 @@ material = "1.13.0-alpha09"
moshi = "1.15.2"
okhttp = "4.12.0"
okio = "3.10.2"
parsers = "6abcdd8d4b"
parsers = "8481fadbd0"
preference = "1.2.1"
recyclerview = "1.4.0"
room = "2.6.1"