summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-05-21 14:52:14 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-05-21 14:52:14 +0200
commit62686a3410e132554bc0830448b58048e018c1bb (patch)
tree5586515d72500538e4f04a2aaa554b4e4602e204
parentaf0cf2dc5bb6da8806fa89b70eeae220adc5a8d4 (diff)
parentf73aa1e33bcabb9516fea51bdbcbccfb7fb48fa4 (diff)
downloadmullvadvpn-62686a3410e132554bc0830448b58048e018c1bb.tar.xz
mullvadvpn-62686a3410e132554bc0830448b58048e018c1bb.zip
Merge branch 'port-android-app-2025.4-beta2-to-main'
-rw-r--r--android/CHANGELOG.md8
-rw-r--r--dist-assets/android-version-code.txt2
-rw-r--r--dist-assets/android-version-name.txt2
3 files changed, 10 insertions, 2 deletions
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md
index 1bd0710fe6..f747f9de67 100644
--- a/android/CHANGELOG.md
+++ b/android/CHANGELOG.md
@@ -29,6 +29,14 @@ Line wrap the file at 100 chars. Th
is drastically smaller.
+## [android/2025.4-beta2] - 2025-05-20
+### Changed
+- Improve error message when the app cannot connect due to an invalid port.
+
+### Fixed
+- Fix password prompt appearing every time when returning to the welcome screen.
+
+
## [android/2025.4-beta1] - 2025-05-06
### Added
- Make feature indicators clickable, allowing for easy access to active features.
diff --git a/dist-assets/android-version-code.txt b/dist-assets/android-version-code.txt
index 534ae4ee74..b68f5d6779 100644
--- a/dist-assets/android-version-code.txt
+++ b/dist-assets/android-version-code.txt
@@ -1 +1 @@
-25041001
+25041002
diff --git a/dist-assets/android-version-name.txt b/dist-assets/android-version-name.txt
index 136f0e0862..9784e42e7f 100644
--- a/dist-assets/android-version-name.txt
+++ b/dist-assets/android-version-name.txt
@@ -1 +1 @@
-2025.4-beta1
+2025.4-beta2