From ea960cce74731f392f75c1e5699e8ed67e24d9d1 Mon Sep 17 00:00:00 2001
From: Firezone Bot <github-bot@firezone.dev>
Date: Wed, 6 Aug 2025 02:38:23 +1000
Subject: [PATCH] chore: publish android-client 1.5.3 (#10141)

---
 .github/workflows/_kotlin.yml                | 4 ++--
 kotlin/android/app/build.gradle.kts          | 2 +-
 scripts/bump-versions.sh                     | 4 ++--
 website/redirects.js                         | 2 +-
 website/src/app/api/releases/route.ts        | 2 +-
 website/src/components/Changelog/Android.tsx | 5 +++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml
index cf3e46c18..e2ef3639d 100644
--- a/.github/workflows/_kotlin.yml
+++ b/.github/workflows/_kotlin.yml
@@ -28,7 +28,7 @@ jobs:
       contents: write # for updating the release draft
     env:
       # mark:next-android-version
-      RELEASE_NAME: android-client-1.5.3
+      RELEASE_NAME: android-client-1.5.4
     steps:
       - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
         if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}"
@@ -100,7 +100,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # mark:next-android-version
-          RELEASE_NAME: android-client-1.5.3
+          RELEASE_NAME: android-client-1.5.4
         run: |
           export ARTIFACT_PATH="$RUNNER_TEMP/firezone-${RELEASE_NAME}.${{ matrix.package-type }}"
           cp "${{ matrix.output-path }}" "$ARTIFACT_PATH"
diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts
index 64ceab7b4..18e1ac0eb 100644
--- a/kotlin/android/app/build.gradle.kts
+++ b/kotlin/android/app/build.gradle.kts
@@ -53,7 +53,7 @@ android {
         targetSdk = 36
         versionCode = (System.currentTimeMillis() / 1000 / 10).toInt()
         // mark:next-android-version
-        versionName = "1.5.3"
+        versionName = "1.5.4"
         multiDexEnabled = true
         testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner"
 
diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh
index 55159140f..147886289 100755
--- a/scripts/bump-versions.sh
+++ b/scripts/bump-versions.sh
@@ -126,8 +126,8 @@ function apple() {
 # 6. Run `scripts/bump-versions.sh android` to update the versions in the codebase.
 # 7. Commit the changes and open a PR.
 function android() {
-    current_android_client_version="1.5.2"
-    next_android_client_version="1.5.3"
+    current_android_client_version="1.5.3"
+    next_android_client_version="1.5.4"
 
     update_changelog "website/src/components/Changelog/Android.tsx" "$current_android_client_version"
     find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-android-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_android_client_version}"'/g;}' {} \;
diff --git a/website/redirects.js b/website/redirects.js
index b9bd5b538..3551baae6 100644
--- a/website/redirects.js
+++ b/website/redirects.js
@@ -29,7 +29,7 @@ module.exports = [
     source: "/dl/firezone-client-android/latest",
     destination:
       // mark:current-android-version
-      "https://www.github.com/firezone/firezone/releases/download/android-client-1.5.2/firezone-android-client-1.5.2.apk",
+      "https://www.github.com/firezone/firezone/releases/download/android-client-1.5.3/firezone-android-client-1.5.3.apk",
     permanent: false,
   },
   /*
diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts
index b57ef7614..537b69130 100644
--- a/website/src/app/api/releases/route.ts
+++ b/website/src/app/api/releases/route.ts
@@ -7,7 +7,7 @@ export async function GET(_req: NextRequest) {
     // mark:current-apple-version
     apple: "1.5.6",
     // mark:current-android-version
-    android: "1.5.2",
+    android: "1.5.3",
     // mark:current-gui-version
     gui: "1.5.6",
     // mark:current-headless-version
diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx
index f12d4b4dd..d369fb4c2 100644
--- a/website/src/components/Changelog/Android.tsx
+++ b/website/src/components/Changelog/Android.tsx
@@ -20,7 +20,8 @@ export default function Android() {
   return (
     <Entries downloadLinks={downloadLinks} title="Android">
       {/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This must not be done when the issue's PR merges. */}
-      <Unreleased>
+      <Unreleased></Unreleased>
+      <Entry version="1.5.3" date={new Date("2025-08-05")}>
         <ChangeItem pull="9985">
           Fixes an issue where control plane messages could be stuck forever on
           flaky connections, requiring signing out and back in to recover.
@@ -41,7 +42,7 @@ export default function Android() {
           Decreases connection setup time on flaky Internet connections in
           certain edge cases.
         </ChangeItem>
-      </Unreleased>
+      </Entry>
       <Entry version="1.5.2" date={new Date("2025-06-30")}>
         <ChangeItem pull="9621">
           Fixes an issue where the VPN permission screen wouldn't dismiss after