VPN-7002 fix - always load location (#10589) (#10590)

Author: mcleinman

addons/message_upgrade_to_bundle_1/conditions.js

@@ -20,6 +20,9 @@ api.connectSignal(api.subscriptionData, 'changed', () => computeCondition());
 api.connectSignal(
     api.subscriptionData, 'initialized', () => computeCondition());
 
+// Run on app launch after getting current location
+api.connectSignal(api.location, 'changed', () => computeCondition());
+
 // This is for already-running clients that receive this addon while the client
 // is launched and signed in. (These users may not see a change in
 // subscriptionData for a long time.)

addons/message_upgrade_to_bundle_2/conditions.js

@@ -20,6 +20,9 @@ api.connectSignal(api.subscriptionData, 'changed', () => computeCondition());
 api.connectSignal(
     api.subscriptionData, 'initialized', () => computeCondition());
 
+// Run on app launch after getting current location
+api.connectSignal(api.location, 'changed', () => computeCondition());
+
 // This is for already-running clients that receive this addon while the client
 // is launched and signed in. (These users may not see a change in
 // subscriptionData for a long time.)

addons/message_upgrade_to_bundle_3/conditions.js

@@ -20,6 +20,9 @@ api.connectSignal(api.subscriptionData, 'changed', () => computeCondition());
 api.connectSignal(
     api.subscriptionData, 'initialized', () => computeCondition());
 
+// Run on app launch after getting current location
+api.connectSignal(api.location, 'changed', () => computeCondition());
+
 // This is for already-running clients that receive this addon while the client
 // is launched and signed in. (These users may not see a change in
 // subscriptionData for a long time.)

src/mozillavpn.cpp

@@ -1113,12 +1113,9 @@ void MozillaVPN::controllerStateChanged() {
   }
 
   if (!m_controllerInitialized && m_private->m_controller.isInitialized()) {
+    logger.debug() << "Controller initialized";
     m_controllerInitialized = true;
-
-    if (SettingsHolder::instance()->startAtBoot()) {
-      logger.debug() << "Start on boot";
-      activate();
-    }
+    maybeConnectOnStartup();
   }
 
   if (m_updating && controllerState == Controller::StateOff) {
@@ -1127,6 +1124,16 @@ void MozillaVPN::controllerStateChanged() {
   NetworkManager::instance()->clearCache();
 }
 
+void MozillaVPN::maybeConnectOnStartup() {
+  if (m_controllerInitialized && m_locationInitialized) {
+    if (SettingsHolder::instance()->startAtBoot()) {
+      logger.debug()
+          << "Both controller and location initialized. Starting on boot.";
+      activate();
+    }
+  }
+}
+
 void MozillaVPN::heartbeatCompleted(bool success) {
   logger.debug() << "Server-side check done:" << success;
 
@@ -1254,8 +1261,16 @@ void MozillaVPN::scheduleRefreshDataTasks() {
   // https://mozilla-hub.atlassian.net/browse/VPN-3726 for more information.
   if (!m_private->m_location.initialized() &&
       !m_private->m_controller.isActive()) {
-    TaskScheduler::scheduleTask(
-        new TaskGetLocation(ErrorHandler::PropagateError));
+    TaskGetLocation* locationTask =
+        new TaskGetLocation(ErrorHandler::PropagateError);
+    connect(locationTask, &TaskGetLocation::completed, [this]() {
+      if (!m_locationInitialized) {
+        logger.debug() << "Location initialized";
+        m_locationInitialized = true;
+        maybeConnectOnStartup();
+      }
+    });
+    TaskScheduler::scheduleTask(locationTask);
   }
 
   TaskScheduler::scheduleTask(new TaskGroup(refreshTasks));

src/mozillavpn.h

@@ -222,6 +222,8 @@ class MozillaVPN final : public App {
 
   void controllerStateChanged();
 
+  void maybeConnectOnStartup();
+
   void maybeRegenerateDeviceKey();
 
   bool checkCurrentDevice();
@@ -275,6 +277,7 @@ class MozillaVPN final : public App {
   bool m_startMinimized = false;
   bool m_updating = false;
   bool m_controllerInitialized = false;
+  bool m_locationInitialized = false;
 };
 
 #endif  // MOZILLAVPN_H