From 16c7e3c5714397bec02170c1d1adea56ed2002ac Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Tue, 21 May 2024 13:43:24 +0700
Subject: [PATCH] fix: Ignore prod build for nightly app

---
 .../kanade/tachiyomi/data/updater/AppUpdateChecker.kt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
index 346371443f..cab4290cd6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
@@ -91,11 +91,11 @@ class AppUpdateChecker {
         val newPreReleaseVer = newVersion.split("-")
         val oldPreReleaseVer = oldVersion.split("-")
         val newSemVer = newPreReleaseVer.first().split(".").map { it.toInt() }
-        val isNightly = newSemVer.size == 1
+        val isNewVersionNightly = newSemVer.size == 1
         val oldSemVer = oldPreReleaseVer.first().split(".").map { it.toInt() }
 
         oldSemVer.mapIndexed { index, i ->
-            if (!isNightly && newSemVer.getOrElse(index) { i } > i) {
+            if (!isNewVersionNightly && newSemVer.getOrElse(index) { i } > i) {
                 return true
             } else if (newSemVer.getOrElse(index) { i } < i) {
                 return false
@@ -104,7 +104,7 @@ class AppUpdateChecker {
         // For cases of extreme patch versions (new: 1.2.3.1 vs old: 1.2.3, return true)
         return if (newSemVer.size > oldSemVer.size) {
             true
-        } else if (newSemVer.size < oldSemVer.size && !isNightly) {
+        } else if (newSemVer.size < oldSemVer.size && !isNewVersionNightly) {
             false
         } else {
             // If the version numbers match, check the beta versions
@@ -113,11 +113,14 @@ class AppUpdateChecker {
             val oldPreVersion =
                 oldPreReleaseVer.getOrNull(1)?.replace("[^\\d.-]".toRegex(), "")?.toIntOrNull()
             when {
+                oldPreVersion == null || newPreVersion == null -> false  // FIXME: Check if the app is Nightly or Beta
+                /*
                 // For prod, don't bother with betas (current: 1.2.3 vs new: 1.2.3-b1)
                 oldPreVersion == null -> false
                 // For betas, always use prod builds (current: 1.2.3-b1 vs new: 1.2.3)
                 newPreVersion == null -> true
-                // For betas, higher beta ver is newer (current: 1.2.3-b1 vs new: 1.2.3-b2)
+                */
+                // For nightly, higher beta ver is newer (current: 1.2.3-b1 vs new: 1.2.3-b2 or r2)
                 else -> (oldPreVersion < newPreVersion)
             }
         }