ignore

Author: DP-Hridayan

.github/workflows/pre_release_push.yml

@@ -3,8 +3,9 @@ name: Build and Release Alpha APK
 on:
   push:
     tags:
-      - "alpha-*"
-  workflow_dispatch:
+      - "v*-debug*"
+      - "v*-alpha*"
+      - "v*-beta*"
 
 jobs:
   build:

.github/workflows/release.yml

@@ -4,19 +4,19 @@ on:
   push:
     tags:
       - "v*" # Runs when a tag like "v6.0.1" is pushed
-  workflow_dispatch:
 
 jobs:
   build:
     name: Build and Sign APK
+    if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref_name, '-')
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6
         with:
-         submodules: recursive
-         fetch-depth: 0
+          submodules: recursive
+          fetch-depth: 0
 
       - name: Set up JDK
         uses: actions/setup-java@v5
@@ -57,7 +57,7 @@ jobs:
   release:
     name: Create GitHub Release
     needs: build
-    if: startsWith(github.ref, 'refs/tags/v')
+    if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref_name, '-')
     runs-on: ubuntu-latest
 
     steps:
@@ -86,10 +86,10 @@ jobs:
 
           # Convert \n to newline + bullet
           CHANGELOG=$(echo "$CHANGELOG" | sed 's/\\n/\n* /g')
-  
+          
           # Add heading cleanly
           CHANGELOG="### Changelog\n\n$CHANGELOG"
-  
+          
           # Write to file
           echo -e "$CHANGELOG" > changelog.txt
 
@@ -116,8 +116,8 @@ jobs:
       - name: Notify Telegram of New Release
         env:
           TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
-          CHAT_ID:         ${{ secrets.CHAT_ID }}
-          THREAD_ID:       ${{ secrets.RELEASE_THREAD_ID }}
+          CHAT_ID: ${{ secrets.CHAT_ID }}
+          THREAD_ID: ${{ secrets.RELEASE_THREAD_ID }}
         run: |
           TAG=${{ github.ref_name }}
           URL="https://github.com/${{ github.repository }}/releases/tag/${TAG}"

app/src/main/java/in/hridayan/ashell/settings/domain/usecase/CheckUpdateUseCase.kt

@@ -1,13 +1,17 @@
 package `in`.hridayan.ashell.settings.domain.usecase
 
-import `in`.hridayan.ashell.settings.domain.model.UpdateResult
 import `in`.hridayan.ashell.core.domain.repository.GithubDataRepository
+import `in`.hridayan.ashell.settings.domain.model.UpdateResult
 import javax.inject.Inject
 
 class CheckUpdateUseCase @Inject constructor(
     private val repository: GithubDataRepository
 ) {
-    suspend operator fun invoke(currentVersion: String, includePrerelease: Boolean, releaseType: Int): UpdateResult {
+    suspend operator fun invoke(
+        currentVersion: String,
+        includePrerelease: Boolean,
+        releaseType: Int
+    ): UpdateResult {
         return when (val result = repository.fetchLatestRelease(includePrerelease, releaseType)) {
             is UpdateResult.Success -> {
                 val isNewer = isNewerVersion(result.release.tagName, currentVersion)
@@ -20,17 +24,51 @@ class CheckUpdateUseCase @Inject constructor(
         }
     }
 
+    private data class ParsedVersion(
+        val numbers: List<Int>,
+        val stage: Int,
+        val stageNumber: Int
+    )
+
     private fun isNewerVersion(latest: String, current: String): Boolean {
-        val latestParts = latest.trimStart('v').split(".")
-        val currentParts = current.removeSuffix("-debug").trimStart('v').split(".")
-
-        for (i in 0 until maxOf(latestParts.size, currentParts.size)) {
-            val l = latestParts.getOrNull(i)?.toIntOrNull() ?: 0
-            val c = currentParts.getOrNull(i)?.toIntOrNull() ?: 0
-            if (l > c) return true
-            if (l < c) return false
+        val l = parseVersion(latest)
+        val c = parseVersion(current)
+
+        for (i in 0 until maxOf(l.numbers.size, c.numbers.size)) {
+            val lv = l.numbers.getOrElse(i) { 0 }
+            val cv = c.numbers.getOrElse(i) { 0 }
+
+            if (lv > cv) return true
+            if (lv < cv) return false
         }
-        return false
+
+        if (l.stage > c.stage) return true
+        if (l.stage < c.stage) return false
+
+        return l.stageNumber > c.stageNumber
+    }
+
+    private fun parseVersion(version: String): ParsedVersion {
+        val cleaned = version.trim().trimStart('v')
+
+        val regex = Regex("""^(\d+(?:\.\d+)*)(?:-(alpha|beta|debug)(\d+)?)?$""")
+        val match = regex.matchEntire(cleaned)
+            ?: return ParsedVersion(emptyList(), 0, 0)
+
+        val numbers = match.groupValues[1]
+            .split(".")
+            .map { it.toInt() }
+
+        val stage = when (match.groupValues[2]) {
+            "debug" -> 0
+            "alpha" -> 1
+            "beta" -> 2
+            else -> 3 // stable
+        }
+
+        val stageNumber = match.groupValues[3].toIntOrNull() ?: 0
+
+        return ParsedVersion(numbers, stage, stageNumber)
     }
 }