Tidy up onboarding in mobile controllers

mozilla-mobile · Dec 18, 2024 · f8836b7 · f8836b7
1 parent b30869f
commit f8836b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/platforms/android/androidcontroller.cpp b/src/platforms/android/androidcontroller.cpp
@@ -100,13 +100,7 @@ AndroidController::AndroidController() {
       Qt::QueuedConnection);
   connect(
       activity, &AndroidVPNActivity::eventOnboardingCompleted, this,
-      [this]() {
-        auto vpn = MozillaVPN::instance();
-        if (vpn->state() == App::StateOnboarding) {
-          vpn->onboardingCompleted();
-          emit disconnected();
-        }
-      },
+      [this]() { emit disconnected(); },
       Qt::QueuedConnection);
   connect(
       activity, &AndroidVPNActivity::eventVpnConfigPermissionResponse, this,
@@ -251,8 +245,7 @@ void AndroidController::activate(const InterfaceConfig& config,
   args["isUsingShortTimerSessionPing"] =
       settingsHolder->shortTimerSessionPing();
 
-  args["isOnboarding"] =
-      MozillaVPN::instance()->state() == App::StateOnboarding;
+  args["isOnboarding"] = reason == Controller::ReasonOnboarding;
 
   QJsonDocument doc(args);
   AndroidVPNActivity::sendToService(ServiceAction::ACTION_ACTIVATE,

diff --git a/src/platforms/ios/ioscontroller.mm b/src/platforms/ios/ioscontroller.mm
@@ -187,12 +187,9 @@
         }
       }
       onboardingCompletedCallback:^() {
-        BOOL isOnboarding = MozillaVPN::instance()->state() == App::StateOnboarding;
-        if (isOnboarding) {
+        if (reason == Controller::ReasonOnboarding) {
           logger.debug() << "Onboarding completed";
-          MozillaVPN::instance()->onboardingCompleted();
-        } else {
-          logger.debug() << "Not onboarding";
+          emit disconnected();
         }
       }
       vpnConfigPermissionResponseCallback:^(BOOL granted) {