Merge branch 'update-changelog-from-android-2022.1-release-branch'

2 files changed, 50 insertions, 58 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db4c87326c..c8e0fee0e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,19 +43,6 @@ Line wrap the file at 100 chars.                                              Th
 - CLI command for setting a specific server by hostname is no longer case sensitive.
   Example: `mullvad relay set hostname SE9-WIREGUARD` should now work.
 
-#### Android
-- Avoid running in foreground when not connected.
-- Avoid removing notification when service is stopped.
-- Change so that swiping the notification no longer kills the service since that isn't a common way
-  of handling the lifecycle in Android. Instead rely on the following mechanisms to kill the
-  service:
-  * Swiping to remove from the Recents/Overview screen.
-  * Android Background Execution Limits.
-  * The System Settings way of killing apps ("Force Stop").
-- Change Quick Settings tile label to reflect the action of clicking the tile. Also add a subtitle
-  on supported Android versions (Q and above) to reflect the state.
-- Hide the tunnel state notification from the lock screen.
-
 #### Windows
 - Update wireguard-nt to 0.10.1.
 - Make wireguard-nt the default driver for WireGuard. This is used instead of wireguard-go and
@@ -94,14 +81,6 @@ Line wrap the file at 100 chars.                                              Th
 - Fix notifications on Windows not showing if window is unpinned and hidden.
 - Wait for IP interfaces to arrive before trying to configure them when using wireguard-nt.
 
-#### Android
-- Fix Quick Settings tile showing wrong state in certain scenarios.
-- Fix banner sometimes incorrectly showing (e.g. "BLOCKING INTERNET").
-- Fix issue with the user getting kicked out of certain views in settings when the app is brought to the foreground.
-- Fix "Secure my connection" action not always visible in tunnel state notification.
-- Fix tunnel state notification sometimes re-appearing after being dismissed.
-- Fix app sometimes crashing during startup on Android TVs.
-
 ### Security
 - Restrict which applications are allowed to communicate with the API while in a blocking state.
   This prevents malicious scripts on websites from trying to do so. On Windows, only
@@ -109,6 +88,56 @@ Line wrap the file at 100 chars.                                              Th
   whereas on Linux and macOS only root processes are able to reach the API.
 
 
+## [android/2022.1-beta2] - 2022-01-27
+### Fixed
+#### Android
+- Fix app sometimes crashing during startup on Android TVs.
+
+
+## [android/2022.1-beta1] - 2022-01-26
+### Added
+#### Android
+- Add toggle for Split tunneling view to be able to show system apps
+- Add support of adaptive icons (available only from Android 8).
+
+### Changed
+- Gradually increase the WireGuard connectivity check timeout, lowering the timeout for the first
+  few attempts.
+
+#### Android
+- Improve stability by running the UI and the tunnel management logic in separate processes.
+- Remove dialog warning that only custom local DNS servers are supported, since public custom DNS
+  servers are now supported.
+- Drop support for Android 7/7.1 (Android 8/API level 26 or later is now required).
+- Change so that swiping the notification no longer kills the service since that isn't a common way
+  of handling the lifecycle in Android. Instead rely on the following mechanisms to kill the
+  service:
+  * Swiping to remove app from the Recents/Overview screen.
+  * Android Background Execution Limits.
+  * The System Settings way of killing apps ("Force Stop").
+- Change Quick Settings tile label to reflect the action of clicking the tile. Also add a subtitle
+  on supported Android versions (Q and above) to reflect the state.
+- Hide the tunnel state notification from the lock screen.
+
+### Fixed
+#### Android
+- Fix banner sometimes incorrectly showing (e.g. "BLOCKING INTERNET").
+- Fix tunnel state notification sometimes re-appearing after being dismissed.
+- Fix invalid URLs. Rely on browser locale rather than app/system language.
+- Automatically disable custom DNS when no servers have been added.
+- Fix issue where erasing wireguard MTU value did not clear its setting.
+- Fix initial state of Split tunneling excluded apps list. Previously it was not notified the daemon
+properly after initialization.
+- Fix UI sometimes not updating correctly while no split screen or after having a dialog from
+  another app appear on top.
+- Fix request to connect from notification or quick-settings tile not connecting if VPN permission
+  isn't granted to the app. The app will now show the UI to ask for the permission and correctly
+  connect after it is granted.
+- Fix quick-settings tile sometimes showing the wrong tunnel state.
+- Fix TV-only apps not appearing in the Split Tunneling screen.
+- Fix status bar having the wrong color after logging out.
+
+
 ## [2021.6] - 2021-11-17
 ### Fixed
 - Fix the font for Russian. Issue introduced in 2021.6-beta1.
@@ -125,9 +154,6 @@ Line wrap the file at 100 chars.                                              Th
 - Revamp main view with blurred background behind semi-transparent buttons and switch to
   correct font for logo. Also a slightly less bold font in other parts of the app.
 
-#### Android
-- Drop support for Android 7/7.1 (Android 8/API level 26 or later is now required).
-
 ### Removed
 - Remove the old Let's encrypt root certificate from the API REST client. Only bundle and
   use the latest certificate.
@@ -150,11 +176,6 @@ Line wrap the file at 100 chars.                                              Th
   state, for example when using virtual switches in Hyper-V.
 - Improve repositioning of app window after connecting/disconnecting external monitor.
 
-#### Android
-- Fix reconnect on app resume. Don't reconnect the tunnel every time the app is opened.
-- Fix invalid URLs. Rely on browser locale rather than app/system language.
-- Automatically disable custom DNS when no servers have been added.
-
 #### macOS
 - Prevent app from showing when dragging tray icon on macOS.
 - Move window after dragging tray icon to new position.
@@ -188,9 +209,6 @@ This release is identical to 2021.5-beta2 except that it has translations for ne
 - Add setting for changing between IPv4 and IPv6 for the connection to WireGuard servers on
   desktop.
 
-#### Android
-- Added toggle for Split tunneling view to be able to show system apps
-
 #### Windows
 - Resolve symbolic links and junctions for excluded apps.
 - Add opt-in support for NT kernel WireGuard driver. It can be enabled in the CLI.
@@ -257,11 +275,6 @@ This release is identical to 2021.5-beta2 except that it has translations for ne
   of failing due to "no matching relays".
 - Retry tunnel device creation multiple times to work around issues early after boot or hibernation.
 
-#### Android
-- Fix erasing wireguard MTU value in some scenarious.
-- Fix initial state of Split tunneling excluded apps list. Previously it was not notified the daemon
-properly after initialization.
-
 
 ## [2021.4] - 2021-06-30
 This release is for desktop only.
@@ -283,9 +296,6 @@ This release is for desktop only.
 #### Windows
 - Add split tunneling as a beta feature. Allows excluding some applications from the VPN tunnel.
 
-#### Android
-- Added support of adaptive icons (available only from Android 8).
-
 ### Changed
 - Upgrade OpenVPN from 2.5.0 to 2.5.1.
 - Replace CLI command `mullvad custom-dns` with the new command `mullvad dns`.
@@ -297,11 +307,6 @@ This release is for desktop only.
 - Use an ICMP socket instead of relying on a `ping` binary in `$PATH` to establish if a tunnel is
   working.
 
-#### Android
-- Improve stability by running the UI and the tunnel management logic in separate processes.
-- Remove dialog warning that only custom local DNS servers are supported, since public custom DNS
-  servers are now supported.
-
 #### macOS
 - Update shape of macOS icon to be in line with Apple's guidelines.
 
@@ -327,15 +332,6 @@ This release is for desktop only.
 - Fix downgrades on macOS silently keeping previous version.
 - Fix other menubar context menus not always closing when opening app on macOS 11.
 
-#### Android
-- Fix UI sometimes not updating correctly while no split screen or after having a dialog from
-  another app appear on top.
-- Fix request to connect from notification or quick-settings tile not connecting if VPN permission
-  isn't granted to the app. The app will now show the UI to ask for the permission and correctly
-  connect after it is granted.
-- Fix quick-settings tile sometimes showing the wrong tunnel state.
-- Fix TV-only apps not appearing in the Split Tunneling screen.
-
 ### Security
 #### Linux
 - Drop packets being *forwarded* unless they are approved by the same rules as incoming or outgoing
@@ -384,9 +380,6 @@ This release is for desktop only.
 #### Linux
 - Further improve offline monitor to properly receive `ENETUNREACH`.
 
-#### Android
-- Fix status bar having the wrong color after logging out.
-
 ### Security
 - Always reconnect appropriately after an upgrade. Previously, installing the app twice in
   succession, with auto-connect disabled, would cause it to re-launch in the disconnected state.
diff --git a/android/app/src/main/play/release-notes/en-US/default.txt b/android/app/src/main/play/release-notes/en-US/default.txt
index 528895e331..e69de29bb2 100644
--- a/android/app/src/main/play/release-notes/en-US/default.txt
+++ b/android/app/src/main/play/release-notes/en-US/default.txt
@@ -1 +0,0 @@
-- First stable release. Identical to last beta release.