From 1ef9f6e96bc08e39eb28c971f8337d65fab82f7f Mon Sep 17 00:00:00 2001
From: Sebastian Streich <git@basti.fyi>
Date: Tue, 31 Mar 2026 17:18:50 +0200
Subject: [PATCH 01/10] VPN-7203 - Part 1: Add a QML API for Androids
 BatteryOptimization

This patch picks up PR #10897 - and wires up android batteryOptimization status to QML

Co-authored-by: im7mortal <5336231+im7mortal@users.noreply.github.com>
---
 android/AndroidManifest.xml                   |  1 +
 .../qt/common/BatteryOptimizationHelper.kt    | 50 +++++++++++++++++
 .../android/androidbatteryoptimizer.cpp       | 43 +++++++++++++++
 .../android/androidbatteryoptimizer.h         | 21 ++++++++
 src/platforms/android/sources.cmake           |  2 +
 src/ui/singletons/BatteryOptimizer.h          | 54 +++++++++++++++++++
 6 files changed, 171 insertions(+)
 create mode 100644 android/common/src/main/java/org/mozilla/firefox/qt/common/BatteryOptimizationHelper.kt
 create mode 100644 src/platforms/android/androidbatteryoptimizer.cpp
 create mode 100644 src/platforms/android/androidbatteryoptimizer.h
 create mode 100644 src/ui/singletons/BatteryOptimizer.h

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 07e34302e6..b1bd6faf0f 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -12,6 +12,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
diff --git a/android/common/src/main/java/org/mozilla/firefox/qt/common/BatteryOptimizationHelper.kt b/android/common/src/main/java/org/mozilla/firefox/qt/common/BatteryOptimizationHelper.kt
new file mode 100644
index 0000000000..8cf9711c7d
--- /dev/null
+++ b/android/common/src/main/java/org/mozilla/firefox/qt/common/BatteryOptimizationHelper.kt
@@ -0,0 +1,50 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.firefox.qt.common
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.PowerManager
+import android.provider.Settings
+
+object BatteryOptimizationHelper {
+
+    @JvmStatic
+    fun isIgnoringBatteryOptimizations(context: Context): Boolean {
+        return try {
+            val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+            pm.isIgnoringBatteryOptimizations(context.packageName)
+        } catch (e: Exception) { true }
+    }
+
+    @JvmStatic
+    fun hasRequestIgnoreBatteryOptimizationsPermission(context: Context): Boolean {
+        return try {
+            context.packageManager.checkPermission(
+                "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS",
+                context.packageName) == PackageManager.PERMISSION_GRANTED
+        } catch (e: Exception) { false }
+    }
+
+    @JvmStatic
+    fun getRequestIgnoreBatteryOptimizationsIntent(context: Context): Intent? {
+        return try {
+            if (hasRequestIgnoreBatteryOptimizationsPermission(context)) {
+                Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS).apply {
+                    data = Uri.parse("package:${context.packageName}")
+                }
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                    data = Uri.parse("package:${context.packageName}")
+                }
+            } else {
+                Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)
+            }
+        } catch (e: Exception) { null }
+    }
+}
diff --git a/src/platforms/android/androidbatteryoptimizer.cpp b/src/platforms/android/androidbatteryoptimizer.cpp
new file mode 100644
index 0000000000..86e196326e
--- /dev/null
+++ b/src/platforms/android/androidbatteryoptimizer.cpp
@@ -0,0 +1,43 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "androidbatteryoptimizer.h"
+
+#include <QJniObject>
+
+#include "androidcommons.h"
+
+constexpr auto BATTERY_HELPER_CLASS =
+    "org/mozilla/firefox/qt/common/BatteryOptimizationHelper";
+
+// static
+bool AndroidBatteryOptimizer::batteryOptimizationEnabled() {
+  QJniObject ctx = AndroidCommons::getActivity();
+  jboolean ignoring = QJniObject::callStaticMethod<jboolean>(
+      BATTERY_HELPER_CLASS, "isIgnoringBatteryOptimizations",
+      "(Landroid/content/Context;)Z", ctx.object<jobject>());
+  return !ignoring;
+}
+
+// static
+bool AndroidBatteryOptimizer::canTriggerIntent() {
+  QJniObject ctx = AndroidCommons::getActivity();
+  return (bool)QJniObject::callStaticMethod<jboolean>(
+      BATTERY_HELPER_CLASS, "hasRequestIgnoreBatteryOptimizationsPermission",
+      "(Landroid/content/Context;)Z", ctx.object<jobject>());
+}
+
+// static
+void AndroidBatteryOptimizer::triggerBatteryOptimizationIntent() {
+  QJniObject ctx = AndroidCommons::getActivity();
+  QJniObject intent = QJniObject::callStaticObjectMethod(
+      BATTERY_HELPER_CLASS, "getRequestIgnoreBatteryOptimizationsIntent",
+      "(Landroid/content/Context;)Landroid/content/Intent;",
+      ctx.object<jobject>());
+  if (!intent.isValid()) {
+    return;
+  }
+  ctx.callMethod<void>("startActivity", "(Landroid/content/Intent;)V",
+                       intent.object<jobject>());
+}
diff --git a/src/platforms/android/androidbatteryoptimizer.h b/src/platforms/android/androidbatteryoptimizer.h
new file mode 100644
index 0000000000..9ade33b8e6
--- /dev/null
+++ b/src/platforms/android/androidbatteryoptimizer.h
@@ -0,0 +1,21 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef ANDROIDBATTERYOPTIMIZER_H
+#define ANDROIDBATTERYOPTIMIZER_H
+
+class AndroidBatteryOptimizer {
+ public:
+  // true  → optimization IS enabled (VPN at risk)
+  // false → app is exempted (good)
+  static bool batteryOptimizationEnabled();
+
+  // true → app holds REQUEST_IGNORE_BATTERY_OPTIMIZATIONS; system dialog shown directly
+  static bool canTriggerIntent();
+
+  // Opens battery settings (system dialog or app details depending on permission/SDK)
+  static void triggerBatteryOptimizationIntent();
+};
+
+#endif  // ANDROIDBATTERYOPTIMIZER_H
diff --git a/src/platforms/android/sources.cmake b/src/platforms/android/sources.cmake
index c1ef1c703e..1f8f891a7c 100644
--- a/src/platforms/android/sources.cmake
+++ b/src/platforms/android/sources.cmake
@@ -7,6 +7,8 @@ target_sources(shared-sources INTERFACE
      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidcryptosettings.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidcommons.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidcommons.h
+     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidbatteryoptimizer.h
+     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidbatteryoptimizer.cpp
 )
 
 target_link_libraries(shared-sources INTERFACE -ljnigraphics)
diff --git a/src/ui/singletons/BatteryOptimizer.h b/src/ui/singletons/BatteryOptimizer.h
new file mode 100644
index 0000000000..8528884b99
--- /dev/null
+++ b/src/ui/singletons/BatteryOptimizer.h
@@ -0,0 +1,54 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BATTERYOPTIMIZER_H
+#define BATTERYOPTIMIZER_H
+
+#include <QObject>
+#include <QQmlEngine>
+
+#ifdef MZ_ANDROID
+#  include "platforms/android/androidbatteryoptimizer.h"
+#endif
+
+class BatteryOptimizer : public QObject {
+  Q_OBJECT
+  QML_ELEMENT
+  QML_SINGLETON
+
+  Q_PROPERTY(bool batteryOptimizationEnabled READ batteryOptimizationEnabled
+                 NOTIFY stateChanged)
+  Q_PROPERTY(bool canTriggerIntent READ canTriggerIntent NOTIFY stateChanged)
+
+ public:
+  bool batteryOptimizationEnabled() const {
+#ifdef MZ_ANDROID
+    return AndroidBatteryOptimizer::batteryOptimizationEnabled();
+#else
+    return false;
+#endif
+  }
+
+  bool canTriggerIntent() const {
+#ifdef MZ_ANDROID
+    return AndroidBatteryOptimizer::canTriggerIntent();
+#else
+    return false;
+#endif
+  }
+
+  Q_INVOKABLE void triggerBatteryOptimizationIntent() {
+#ifdef MZ_ANDROID
+    AndroidBatteryOptimizer::triggerBatteryOptimizationIntent();
+#endif
+  }
+
+  // Call from QML after returning from the settings screen to refresh bindings.
+  Q_INVOKABLE void refreshState() { emit stateChanged(); }
+
+ signals:
+  void stateChanged();
+};
+
+#endif  // BATTERYOPTIMIZER_H

From 6432b57b946befaacf9410009a3c64aa41452fcb Mon Sep 17 00:00:00 2001
From: Sebastian Streich <git@basti.fyi>
Date: Tue, 31 Mar 2026 18:43:50 +0200
Subject: [PATCH 02/10] Part 2: Add a Message Card

---
 src/translations/strings.yaml                |  3 +++
 src/ui/CMakeLists.txt                        |  3 +++
 src/ui/screens/settings/ViewSettingsMenu.qml | 24 ++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/src/translations/strings.yaml b/src/translations/strings.yaml
index 8088ed9ea4..1814e0fb9d 100644
--- a/src/translations/strings.yaml
+++ b/src/translations/strings.yaml
@@ -359,6 +359,9 @@ settings:
   dnsSettingsWarning: These options may cause some websites to break or not display content correctly.
   dnsSettingsInputPlaceholder: Enter custom DNS
   dnsSettingsDisconnectWarning: Changing these settings will cause the VPN to disconnect and reconnect automatically.
+  batteryOptimizationWarning:
+    value: For the best experience, tap here to ensure reliable app functionality by disabling battery optimization.
+    comment: Warning shown in the settings screen on Android when battery optimization is enabled for the app.
   appExclusionClearAllApps:
     value: Clear all
     comment: Button label to clear all apps from the exclusions list
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 498bf315a3..062a317f5e 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -167,7 +167,10 @@ target_include_directories(mozillavpn-uiplugin PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/types
 )
 
+target_sources(mozillavpn-ui PRIVATE singletons/BatteryOptimizer.h)
+
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
+    target_compile_definitions(mozillavpn-ui PRIVATE MZ_ANDROID)
     target_sources(mozillavpn-ui PRIVATE singletons/VPNAndroidUtils.h)
     target_sources(mozillavpn-ui PRIVATE singletons/VPNAndroidCommons.h)
 endif()
diff --git a/src/ui/screens/settings/ViewSettingsMenu.qml b/src/ui/screens/settings/ViewSettingsMenu.qml
index 934bf7bcef..8b81055480 100644
--- a/src/ui/screens/settings/ViewSettingsMenu.qml
+++ b/src/ui/screens/settings/ViewSettingsMenu.qml
@@ -24,6 +24,30 @@ MZViewBase {
         spacing: MZTheme.theme.windowMargin
         Layout.fillWidth: true
 
+        MZInformationCard {
+            id: batteryOptimizationCard
+            visible: BatteryOptimizer.batteryOptimizationEnabled
+                     && BatteryOptimizer.canTriggerIntent
+            cardType: MZInformationCard.CardType.Warning
+            Layout.preferredWidth: Math.min(window.width - MZTheme.theme.windowMargin * 2,
+                                            MZTheme.theme.navBarMaxWidth)
+            Layout.minimumHeight: batteryWarningText.height + MZTheme.theme.windowMargin * 2
+            Layout.alignment: Qt.AlignHCenter
+
+            _infoContent: MZTextBlock {
+                id: batteryWarningText
+                Layout.fillWidth: true
+                width: undefined
+                text: MZI18n.SettingsBatteryOptimizationWarning
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            MouseArea {
+                anchors.fill: batteryOptimizationCard
+                onClicked: BatteryOptimizer.triggerBatteryOptimizationIntent()
+            }
+        }
+
         ColumnLayout {
             Layout.fillWidth: true
             Layout.leftMargin: MZTheme.theme.windowMargin /2

From eeb88366a10e4e56202478b6cb0cd68e5947d055 Mon Sep 17 00:00:00 2001
From: Sebastian Streich <git@basti.fyi>
Date: Tue, 31 Mar 2026 18:49:19 +0200
Subject: [PATCH 03/10] Part 3: Remember Popup dismissal

---
 src/settingslist.h                           | 10 ++++++++++
 src/ui/screens/settings/ViewSettingsMenu.qml |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/settingslist.h b/src/settingslist.h
index 8e4f369e28..6162c924c3 100644
--- a/src/settingslist.h
+++ b/src/settingslist.h
@@ -335,6 +335,16 @@ SETTING_BOOL(onboardingCompleted,        // getter
              false                       // sensitive (do not log)
 )
 
+SETTING_BOOL(hasDismissedBatteryOptimization,        // getter
+             setHasDismissedBatteryOptimization,     // setter
+             removeHasDismissedBatteryOptimization,  // remover
+             hasHasDismissedBatteryOptimization,     // has
+             "hasDismissedBatteryOptimization",      // key
+             false,                                  // default value
+             true,                                   // remove when reset (clears on logout)
+             false                                   // sensitive (do not log)
+)
+
 SETTING_BOOL(onboardingDataCollectionEnabled,        // getter
              setOnboardingDataCollectionEnabled,     // setter
              removeOnboardingDataCollectionEnabled,  // remover
diff --git a/src/ui/screens/settings/ViewSettingsMenu.qml b/src/ui/screens/settings/ViewSettingsMenu.qml
index 8b81055480..ab3a1fd6d5 100644
--- a/src/ui/screens/settings/ViewSettingsMenu.qml
+++ b/src/ui/screens/settings/ViewSettingsMenu.qml
@@ -26,7 +26,8 @@ MZViewBase {
 
         MZInformationCard {
             id: batteryOptimizationCard
-            visible: BatteryOptimizer.batteryOptimizationEnabled
+            visible: !MZSettings.hasDismissedBatteryOptimization
+                     && BatteryOptimizer.batteryOptimizationEnabled
                      && BatteryOptimizer.canTriggerIntent
             cardType: MZInformationCard.CardType.Warning
             Layout.preferredWidth: Math.min(window.width - MZTheme.theme.windowMargin * 2,
@@ -44,7 +45,10 @@ MZViewBase {
 
             MouseArea {
                 anchors.fill: batteryOptimizationCard
-                onClicked: BatteryOptimizer.triggerBatteryOptimizationIntent()
+                onClicked: {
+                    MZSettings.hasDismissedBatteryOptimization = true
+                    BatteryOptimizer.triggerBatteryOptimizationIntent()
+                }
             }
         }
 

From ce4bc496fd4c610c731d031d09ce0b0cd6f8bb48 Mon Sep 17 00:00:00 2001
From: Sebastian Streich <git@basti.fyi>
Date: Tue, 31 Mar 2026 19:24:04 +0200
Subject: [PATCH 04/10] Linting

---
 src/platforms/android/androidbatteryoptimizer.h | 6 ++++--
 src/platforms/android/androidcryptosettings.h   | 2 +-
 src/settingslist.h                              | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/platforms/android/androidbatteryoptimizer.h b/src/platforms/android/androidbatteryoptimizer.h
index 9ade33b8e6..33a1445a7a 100644
--- a/src/platforms/android/androidbatteryoptimizer.h
+++ b/src/platforms/android/androidbatteryoptimizer.h
@@ -11,10 +11,12 @@ class AndroidBatteryOptimizer {
   // false → app is exempted (good)
   static bool batteryOptimizationEnabled();
 
-  // true → app holds REQUEST_IGNORE_BATTERY_OPTIMIZATIONS; system dialog shown directly
+  // true → app holds REQUEST_IGNORE_BATTERY_OPTIMIZATIONS; system dialog shown
+  // directly
   static bool canTriggerIntent();
 
-  // Opens battery settings (system dialog or app details depending on permission/SDK)
+  // Opens battery settings (system dialog or app details depending on
+  // permission/SDK)
   static void triggerBatteryOptimizationIntent();
 };
 
diff --git a/src/platforms/android/androidcryptosettings.h b/src/platforms/android/androidcryptosettings.h
index 995dce9279..c59a15000d 100644
--- a/src/platforms/android/androidcryptosettings.h
+++ b/src/platforms/android/androidcryptosettings.h
@@ -11,7 +11,7 @@
 
 class AndroidCryptoSettings final : public CryptoSettings {
  public:
-  AndroidCryptoSettings() : CryptoSettings(){};
+  AndroidCryptoSettings() : CryptoSettings() {};
   virtual ~AndroidCryptoSettings() = default;
 
   void resetKey() override;
diff --git a/src/settingslist.h b/src/settingslist.h
index 6162c924c3..9d3193edaa 100644
--- a/src/settingslist.h
+++ b/src/settingslist.h
@@ -341,8 +341,8 @@ SETTING_BOOL(hasDismissedBatteryOptimization,        // getter
              hasHasDismissedBatteryOptimization,     // has
              "hasDismissedBatteryOptimization",      // key
              false,                                  // default value
-             true,                                   // remove when reset (clears on logout)
-             false                                   // sensitive (do not log)
+             true,  // remove when reset (clears on logout)
+             false  // sensitive (do not log)
 )
 
 SETTING_BOOL(onboardingDataCollectionEnabled,        // getter

From d232bda1773084d2ad923cf80448bfe36f154464 Mon Sep 17 00:00:00 2001
From: Sebastian Streich <git@basti.fyi>
Date: Tue, 31 Mar 2026 19:32:10 +0200
Subject: [PATCH 05/10] reset unrelated file

---
 src/platforms/android/androidcryptosettings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platforms/android/androidcryptosettings.h b/src/platforms/android/androidcryptosettings.h
index c59a15000d..995dce9279 100644
--- a/src/platforms/android/androidcryptosettings.h
+++ b/src/platforms/android/androidcryptosettings.h
@@ -11,7 +11,7 @@
 
 class AndroidCryptoSettings final : public CryptoSettings {
  public:
-  AndroidCryptoSettings() : CryptoSettings() {};
+  AndroidCryptoSettings() : CryptoSettings(){};
   virtual ~AndroidCryptoSettings() = default;
 
   void resetKey() override;

From fb6cf4ee5b9cbbc1419973dc94ee269647f290bb Mon Sep 17 00:00:00 2001
From: Sebastian Streich <git@basti.fyi>
Date: Tue, 7 Apr 2026 23:00:38 +0200
Subject: [PATCH 06/10] Use matts cool new component

---
 src/translations/strings.yaml                |  5 ++++-
 src/ui/screens/settings/ViewSettingsMenu.qml | 11 ++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/translations/strings.yaml b/src/translations/strings.yaml
index 1814e0fb9d..287405b5fa 100644
--- a/src/translations/strings.yaml
+++ b/src/translations/strings.yaml
@@ -360,8 +360,11 @@ settings:
   dnsSettingsInputPlaceholder: Enter custom DNS
   dnsSettingsDisconnectWarning: Changing these settings will cause the VPN to disconnect and reconnect automatically.
   batteryOptimizationWarning:
-    value: For the best experience, tap here to ensure reliable app functionality by disabling battery optimization.
+    value: Allow Mozilla VPN to run in background to ensure VPN connection is maintained
     comment: Warning shown in the settings screen on Android when battery optimization is enabled for the app.
+  batteryOptimizationWarningButton:
+    value: Allow background permissions
+    comment: Button label for the call to action to allow background permissions on Android.
   appExclusionClearAllApps:
     value: Clear all
     comment: Button label to clear all apps from the exclusions list
diff --git a/src/ui/screens/settings/ViewSettingsMenu.qml b/src/ui/screens/settings/ViewSettingsMenu.qml
index ab3a1fd6d5..4d674f48b4 100644
--- a/src/ui/screens/settings/ViewSettingsMenu.qml
+++ b/src/ui/screens/settings/ViewSettingsMenu.qml
@@ -38,18 +38,15 @@ MZViewBase {
             _infoContent: MZTextBlock {
                 id: batteryWarningText
                 Layout.fillWidth: true
-                width: undefined
                 text: MZI18n.SettingsBatteryOptimizationWarning
-                verticalAlignment: Text.AlignVCenter
+                //verticalAlignment: Text.AlignVCenter
             }
-
-            MouseArea {
-                anchors.fill: batteryOptimizationCard
-                onClicked: {
+            _buttonAction: function() {
                     MZSettings.hasDismissedBatteryOptimization = true
                     BatteryOptimizer.triggerBatteryOptimizationIntent()
-                }
             }
+            _buttonText : MZI18n.SettingsBatteryOptimizationWarningButton
+
         }
 
         ColumnLayout {

From 828ae0b4223ba323f0d02e916c78c3fff035278f Mon Sep 17 00:00:00 2001
From: Sebastian Streich <strseb@users.noreply.github.com>
Date: Wed, 8 Apr 2026 12:27:06 +0200
Subject: [PATCH 07/10] Update src/translations/strings.yaml

Co-authored-by: Francesco Lodolo <flod@lodolo.net>
---
 src/translations/strings.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/translations/strings.yaml b/src/translations/strings.yaml
index 287405b5fa..c7e86a3196 100644
--- a/src/translations/strings.yaml
+++ b/src/translations/strings.yaml
@@ -360,7 +360,7 @@ settings:
   dnsSettingsInputPlaceholder: Enter custom DNS
   dnsSettingsDisconnectWarning: Changing these settings will cause the VPN to disconnect and reconnect automatically.
   batteryOptimizationWarning:
-    value: Allow Mozilla VPN to run in background to ensure VPN connection is maintained
+    value: Allow Mozilla VPN to run in background to ensure the VPN connection is maintained
     comment: Warning shown in the settings screen on Android when battery optimization is enabled for the app.
   batteryOptimizationWarningButton:
     value: Allow background permissions

From 3cd7a6d356f594bf19affb082d2fdd6bd22a81df Mon Sep 17 00:00:00 2001
From: Sebastian Streich <git@basti.fyi>
Date: Mon, 4 May 2026 13:49:33 +0200
Subject: [PATCH 08/10] Remove unneded line

---
 src/ui/screens/settings/ViewSettingsMenu.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ui/screens/settings/ViewSettingsMenu.qml b/src/ui/screens/settings/ViewSettingsMenu.qml
index 4d674f48b4..5c463521a4 100644
--- a/src/ui/screens/settings/ViewSettingsMenu.qml
+++ b/src/ui/screens/settings/ViewSettingsMenu.qml
@@ -39,7 +39,6 @@ MZViewBase {
                 id: batteryWarningText
                 Layout.fillWidth: true
                 text: MZI18n.SettingsBatteryOptimizationWarning
-                //verticalAlignment: Text.AlignVCenter
             }
             _buttonAction: function() {
                     MZSettings.hasDismissedBatteryOptimization = true

From bbf39a69232f8b7ef7bc6de916c57f8f78cbf3f4 Mon Sep 17 00:00:00 2001
From: Sebastian Streich <git@basti.fyi>
Date: Mon, 11 May 2026 23:13:12 +0200
Subject: [PATCH 09/10] Update string

---
 src/translations/strings.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/translations/strings.yaml b/src/translations/strings.yaml
index c7e86a3196..a82a174388 100644
--- a/src/translations/strings.yaml
+++ b/src/translations/strings.yaml
@@ -360,7 +360,7 @@ settings:
   dnsSettingsInputPlaceholder: Enter custom DNS
   dnsSettingsDisconnectWarning: Changing these settings will cause the VPN to disconnect and reconnect automatically.
   batteryOptimizationWarning:
-    value: Allow Mozilla VPN to run in background to ensure the VPN connection is maintained
+    value: On some devices, Mozilla VPN may be disconnected in the background. If you've experienced this, allow it to run in the background.
     comment: Warning shown in the settings screen on Android when battery optimization is enabled for the app.
   batteryOptimizationWarningButton:
     value: Allow background permissions

From b24ccaf9ac9ffbd6d9e4c7369808d5221c7b0248 Mon Sep 17 00:00:00 2001
From: Sebastian Streich <strseb@users.noreply.github.com>
Date: Tue, 12 May 2026 14:02:23 +0200
Subject: [PATCH 10/10] Update src/translations/strings.yaml

Co-authored-by: Francesco Lodolo <flod@lodolo.net>
---
 src/translations/strings.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/translations/strings.yaml b/src/translations/strings.yaml
index a82a174388..ad43dc4906 100644
--- a/src/translations/strings.yaml
+++ b/src/translations/strings.yaml
@@ -360,7 +360,7 @@ settings:
   dnsSettingsInputPlaceholder: Enter custom DNS
   dnsSettingsDisconnectWarning: Changing these settings will cause the VPN to disconnect and reconnect automatically.
   batteryOptimizationWarning:
-    value: On some devices, Mozilla VPN may be disconnected in the background. If you've experienced this, allow it to run in the background.
+    value: On some devices, Mozilla VPN may be disconnected in the background. If you’ve experienced this, allow it to run in the background.
     comment: Warning shown in the settings screen on Android when battery optimization is enabled for the app.
   batteryOptimizationWarningButton:
     value: Allow background permissions