Turn off new strings (#11285)

* Revert "VPN-7203 - Add a warning when not running with "unrestricted" background usage permission (#11169)"

This reverts commit 94ea52f.

* remove other 2 strings

Author: mcleinman

android/AndroidManifest.xml

@@ -12,7 +12,6 @@ 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.

android/common/src/main/java/org/mozilla/firefox/qt/common/BatteryOptimizationHelper.kt

@@ -7,8 +7,6 @@ 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)

src/platforms/android/androidbatteryoptimizer.cpp

@@ -325,16 +325,6 @@ 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

src/platforms/android/androidbatteryoptimizer.h

@@ -365,12 +365,6 @@ 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: 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
-    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

src/platforms/android/sources.cmake

@@ -166,10 +166,7 @@ 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()

src/settingslist.h

@@ -220,11 +220,6 @@ FocusScope {
                                         return MZI18n.ServersViewRecommendedRefreshlLoadingLabel.arg(
                                             Math.round(VPNServerLatency.progress * 100));
 
-                                    case VPNServerLatency.Initial:
-                                        return (VPNController.state === VPNController.StateOff)
-                                            ? MZI18n.ServersViewRecommendedRefreshNoUpdateLabel
-                                            : MZI18n.ServersViewRecommendedRefreshNoUpdateDisabledLabel;
-
                                     case VPNServerLatency.Loaded:
                                     default:
                                         const formatted = MZLocalizer.formatDate(

src/translations/strings.yaml

@@ -22,30 +22,6 @@ MZViewBase {
         spacing: MZTheme.theme.windowMargin
         Layout.fillWidth: true
 
-        MZInformationCard {
-            id: batteryOptimizationCard
-            visible: !MZSettings.hasDismissedBatteryOptimization
-                     && 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
-                text: MZI18n.SettingsBatteryOptimizationWarning
-            }
-            _buttonAction: function() {
-                    MZSettings.hasDismissedBatteryOptimization = true
-                    BatteryOptimizer.triggerBatteryOptimizationIntent()
-            }
-            _buttonText : MZI18n.SettingsBatteryOptimizationWarningButton
-
-        }
-
         ColumnLayout {
             Layout.fillWidth: true
             Layout.leftMargin: MZTheme.theme.windowMargin /2