Allow for switches in stateonpartial (#10230)

mozilla-mobile · Jan 29, 2025 · 27b1048 · 27b1048
1 parent c066391
commit 27b1048
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/controller.cpp b/src/controller.cpp
@@ -782,12 +782,13 @@ void Controller::disconnected() {
 
   if (nextStep == None &&
       (m_state == StateSilentSwitching || m_state == StateSwitching)) {
-    // If we are only silently switching, keep the iniator
+    // If we are only switching, keep the iniator
     // Else move the iniator to Client User
     // as the extension cannot switch servers.
-    auto target_iniator = m_state == StateSilentSwitching
-                              ? m_initiator
-                              : ActivationPrincipal::ClientUser;
+    auto target_iniator =
+        (m_state == StateSilentSwitching || m_state == StateSwitching)
+            ? m_initiator
+            : ActivationPrincipal::ClientUser;
     activate(m_nextServerData, target_iniator, m_nextServerSelectionPolicy);
     return;
   }

diff --git a/src/ui/screens/home/ViewHome.qml b/src/ui/screens/home/ViewHome.qml
@@ -106,8 +106,9 @@ MZFlickable {
             descriptionText: qsTrId("vpn.servers.currentLocation").arg(
                                  VPNCurrentServer.localizedExitCityName)
 
-            disableRowWhen: (VPNController.state !== VPNController.StateOn
-                             && VPNController.state !== VPNController.StateOff)
+            disableRowWhen: (VPNController.state !== VPNController.StateOn &&
+                            VPNController.state !== VPNController.StateOnPartial &&
+                            VPNController.state !== VPNController.StateOff)
             Layout.topMargin: 12
             contentChildren: [