two versions again

geode-sdk · Nov 15, 2024 · 31b5a8f · 31b5a8f
1 parent b1c8690
commit 31b5a8f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/java/com/geode/launcher/MainActivity.kt b/app/src/main/java/com/geode/launcher/MainActivity.kt
@@ -193,7 +193,7 @@ fun MainScreen(
                             },
                         )
 
-                        if (gdVersion < Constants.SUPPORTED_VERSION_CODE) {
+                        if (gdVersion < Constants.SUPPORTED_VERSION_CODE_MIN_WARNING) {
                             InlineDialog(
                                 headline = {
                                     Icon(

diff --git a/app/src/main/java/com/geode/launcher/updater/ReleaseManager.kt b/app/src/main/java/com/geode/launcher/updater/ReleaseManager.kt
@@ -114,7 +114,8 @@ class ReleaseManager private constructor(
         val gameVersion = GamePackageUtils.getGameVersionCode(applicationContext.packageManager)
 
         return when {
-            gameVersion >= 40L -> mapSelectedReleaseToTag()
+            // default 2.2074 to prereleases while we're in the prerelease era
+            gameVersion >= 40L -> mapSelectedReleaseToTag().takeIf { it != TAG_LATEST } ?: TAG_BETA
             gameVersion == 39L -> "v3.9.2"
             gameVersion == 38L -> "v2.0.0-beta.27"
             gameVersion == 37L -> "v2.0.0-beta.4"

diff --git a/app/src/main/java/com/geode/launcher/utils/Constants.kt b/app/src/main/java/com/geode/launcher/utils/Constants.kt
@@ -13,7 +13,13 @@ object Constants {
     @SuppressLint("SdCardPath")
     const val GJ_DATA_DIR = "/data/data/${PACKAGE_NAME}"
 
+    // anything below this version code is blocked from opening the game
     const val SUPPORTED_VERSION_CODE_MIN = 37L
+
+    // anything below this version code shows a warning on the main menu
+    const val SUPPORTED_VERSION_CODE_MIN_WARNING = 39L
+
+    // anything above this version code will show a warning when starting the game
     const val SUPPORTED_VERSION_CODE = 40L
 
     const val SUPPORTED_VERSION_STRING = "2.2.143"