null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Version checker

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-05-21 12:34:41 +07:00
parent c3faccacd2
commit 86e7aa7d1f
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
View file

@ -103,10 +103,12 @@ class AppUpdateChecker {
// For cases of extreme patch versions (new: 1.2.3.1 vs old: 1.2.3, return true) // For cases of extreme patch versions (new: 1.2.3.1 vs old: 1.2.3, return true)
return if (newSemVer.size > oldSemVer.size) { return if (newSemVer.size > oldSemVer.size) {
true true
} else if (newSemVer.size < oldSemVer.size) { } else if (newSemVer.size < oldSemVer.size && newSemVer.size != 1) { // also check yokai format
false false
} else { } else {
// If the version numbers match, check the beta versions // If the version numbers match, check the beta versions
val newNightlyVersion = // Yokai formatting (e.g. r123)
newPreReleaseVer.getOrNull(0)?.replace("[^\\d.-]".toRegex(), "")?.toIntOrNull()
val newPreVersion = val newPreVersion =
newPreReleaseVer.getOrNull(1)?.replace("[^\\d.-]".toRegex(), "")?.toIntOrNull() newPreReleaseVer.getOrNull(1)?.replace("[^\\d.-]".toRegex(), "")?.toIntOrNull()
val oldPreVersion = val oldPreVersion =
@ -115,9 +117,12 @@ class AppUpdateChecker {
// For prod, don't bother with betas (current: 1.2.3 vs new: 1.2.3-b1) // For prod, don't bother with betas (current: 1.2.3 vs new: 1.2.3-b1)
oldPreVersion == null -> false oldPreVersion == null -> false
// For betas, always use prod builds (current: 1.2.3-b1 vs new: 1.2.3) // For betas, always use prod builds (current: 1.2.3-b1 vs new: 1.2.3)
newPreVersion == null -> true // Also check for new nightly formatting (r123)
newPreVersion == null && newNightlyVersion == null -> true
// For betas, higher beta ver is newer (current: 1.2.3-b1 vs new: 1.2.3-b2) // For betas, higher beta ver is newer (current: 1.2.3-b1 vs new: 1.2.3-b2)
else -> (oldPreVersion < newPreVersion) newNightlyVersion == null -> (oldPreVersion < newPreVersion)
// For (yokai) betas, higher beta ver is newer (current: 1.2.3-b1 vs new: r2)
else -> (oldPreVersion < newNightlyVersion)
} }
} }
} }