chore: Merge branch dev to main (#16)

Author: Ushie

.github/workflows/release.yml

@@ -1,56 +1,56 @@
 name: Release
 
 on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-      - dev
+    workflow_dispatch:
+    push:
+        branches:
+            - main
+            - dev
 
 jobs:
-  release:
-    name: Release
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: "temurin"
-          java-version: "17"
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v2
-
-      - name: Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build --no-daemon
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Setup keystore
-        run: |
-          echo "${{ secrets.KEYSTORE }}" | base64 --decode > "keystore.jks"
-
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
-          KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
-        run: |
-          npx semantic-release
+    release:
+        name: Release
+        permissions:
+            contents: write
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Setup Java
+              uses: actions/setup-java@v4
+              with:
+                  distribution: "temurin"
+                  java-version: "17"
+
+            - name: Cache Gradle
+              uses: burrunan/gradle-cache-action@v2
+
+            - name: Build
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: ./gradlew build --no-daemon
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "lts/*"
+                  cache: "npm"
+
+            - name: Install dependencies
+              run: npm install
+
+            - name: Setup keystore
+              run: |
+                  echo "${{ secrets.KEYSTORE }}" | base64 --decode > "app/keystore.jks"
+
+            - name: Release
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+                  KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
+                  KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
+              run: |
+                  npx semantic-release

CHANGELOG.md

@@ -1,3 +1,65 @@
+# [1.2.0-dev.4](https://github.com/revenge-mod/revenge-manager/compare/v1.2.0-dev.3...v1.2.0-dev.4) (2025-03-17)
+
+
+### Bug Fixes
+
+* Don't cache canceled partial downloads ([b0a637d](https://github.com/revenge-mod/revenge-manager/commit/b0a637d7f6987fa4549ebcd2df67b603ce0b2641)), closes [#21](https://github.com/revenge-mod/revenge-manager/issues/21)
+
+# [1.2.0-dev.3](https://github.com/revenge-mod/revenge-manager/compare/v1.2.0-dev.2...v1.2.0-dev.3) (2025-03-17)
+
+
+### Bug Fixes
+
+* `fillVoid` when replacing AndroidManifest.xml in base apk ([c623d1d](https://github.com/revenge-mod/revenge-manager/commit/c623d1d174b922e27c1b9d90d95ceff95a48bb3f))
+
+# [1.2.0-dev.2](https://github.com/revenge-mod/revenge-manager/compare/v1.2.0-dev.1...v1.2.0-dev.2) (2025-03-04)
+
+
+### Features
+
+* Update mirror list, and fallback to default on invalid selection ([bb31a90](https://github.com/revenge-mod/revenge-manager/commit/bb31a90c714eff84e163ca336d9ee23eea80252c))
+
+# [1.2.0-dev.1](https://github.com/revenge-mod/revenge-manager/compare/v1.1.1-dev.4...v1.2.0-dev.1) (2025-02-09)
+
+
+### Bug Fixes
+
+* App version comparison for updates ([b2a5122](https://github.com/revenge-mod/revenge-manager/commit/b2a51228b41d349e5b973557232624d2e1547895))
+* Parse update download URL from API response ([d9b6916](https://github.com/revenge-mod/revenge-manager/commit/d9b6916a52f72a3bd27fcfb0ca5787fdc084fdc3))
+
+
+### Features
+
+* Add progress tracking to update download ([75602c1](https://github.com/revenge-mod/revenge-manager/commit/75602c1b4a7e2dc41d6a944f9aab0a352d318baa))
+
+## [1.1.1-dev.4](https://github.com/revenge-mod/revenge-manager/compare/v1.1.1-dev.3...v1.1.1-dev.4) (2025-02-05)
+
+
+### Bug Fixes
+
+* Don't remove "unnecessary" prefix handling ([7266bf5](https://github.com/revenge-mod/revenge-manager/commit/7266bf5b7e5c7d642a7d79fc1f8ebc111b34d8cc))
+
+## [1.1.1-dev.3](https://github.com/revenge-mod/revenge-manager/compare/v1.1.1-dev.2...v1.1.1-dev.3) (2025-01-20)
+
+
+### Bug Fixes
+
+* Remove unnecessary prefix handling ([f226621](https://github.com/revenge-mod/revenge-manager/commit/f22662196d3be971d1c46853fdcb165d2158213a))
+
+## [1.1.1-dev.2](https://github.com/revenge-mod/revenge-manager/compare/v1.1.1-dev.1...v1.1.1-dev.2) (2025-01-20)
+
+
+### Bug Fixes
+
+* Correct version code parsing and update dialog comparison ([e6be2f5](https://github.com/revenge-mod/revenge-manager/commit/e6be2f501820ae9cc3663a4cfaf4ac7e125dcc01))
+
+## [1.1.1-dev.1](https://github.com/revenge-mod/revenge-manager/compare/v1.1.0...v1.1.1-dev.1) (2025-01-20)
+
+
+### Bug Fixes
+
+* Invalid updater URLs ([4d01c52](https://github.com/revenge-mod/revenge-manager/commit/4d01c52a21922dc0897cb76917139a9c1bc59e2f))
+
 # [1.1.0](https://github.com/revenge-mod/revenge-manager/compare/v1.0.0...v1.1.0) (2025-01-16)
 
 

app/build.gradle.kts

@@ -18,7 +18,7 @@ android {
         minSdk = 28
         targetSdk = 34
         versionName = version.toString()
-        versionCode = versionName!!.split("-").first().replace(".", "").toInt()
+        versionCode = versionName!!.removePrefix("v").split("-").first().replace(".", "").toInt()
 
 
         buildConfigField("String", "MOD_NAME", "\"Revenge\"")

app/libs/lspatch.aar

@@ -29,13 +29,11 @@ class DownloadManager(
             onProgressUpdate
         )
 
-    suspend fun downloadUpdate(out: File) =
-        download(
-            "https://github.com/revenge-mod/revenge-manager/releases/latest/download/Manager.apk",
-            out
-        ) {
-            /* TODO: Update a progress bar in the update dialog */
+    suspend fun downloadUpdate(url: String, out: File, onProgressUpdate: (Float?) -> Unit) {
+        download(url, out) { progress ->
+            onProgressUpdate(progress)
         }
+    }
 
     /**
      * Start a cancellable download with the system [DownloadManager].
@@ -63,7 +61,7 @@ class DownloadManager(
             .setAllowedOverRoaming(true)
             .let(downloadManager::enqueue)
 
-        var lastProgressTime = System.currentTimeMillis()
+        val lastProgressTime = System.currentTimeMillis()
 
         // Repeatedly request download state until it is finished
         while (true) {

app/src/main/assets/lspatch/so/arm64-v8a/liblspatch.so

@@ -55,10 +55,10 @@ class PreferenceManager(context: Context) :
     var allowDowngrade by booleanPreference("allow_downgrade", false)
 
     init {
-        // Will be removed next update
-        if(mirror == Mirror.VENDETTA_ROCKS) mirror = Mirror.VENDETTA_ROCKS_ALT
+        if (mirror !in Mirror.entries) {
+            mirror = Mirror.DEFAULT
+        }
     }
-
 }
 
 enum class Theme(@StringRes val labelRes: Int) {
@@ -80,10 +80,8 @@ enum class UpdateCheckerDuration(@StringRes val labelRes: Int, val time: Long, v
 
 enum class Mirror(val baseUrl: String) {
     DEFAULT("https://tracker.vendetta.rocks"),
-    VENDETTA_ROCKS("https://proxy.vendetta.rocks"), // Temporarily added for compatibility
-    VENDETTA_ROCKS_ALT("https://proxy.vendetta.rocks"),
-    K6("https://vd.k6.tf"),
-    NEXPID("https://tracker.vd.nexpid.xyz")
+    NEXPID("https://tracker.vd.nexpid.xyz"),
+    USHIE("https://proxy.vd.ushie.dev")
 }
 
 enum class InstallMethod(@StringRes val labelRes: Int) {