Fix Part of #4938: Profile Configuration and Migration

app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt

@@ -76,7 +76,6 @@ class ExitProfileDialogFragment : InjectableDialogFragment() {
         if (soleLearnerProfile) {
           requireActivity().finish()
         } else {
-          // TODO(#3641): Investigate on using finish instead of intent.
           val intent = ProfileChooserActivity.createProfileChooserActivity(requireActivity())
           if (!restoreLastCheckedItem) {
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)

app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt

@@ -373,7 +373,7 @@ class SplashActivityPresenter @Inject constructor(
         resumeOnboarding(profile.id, profile.name)
       }
       profile.startedProfileOnboarding && profile.completedProfileOnboarding -> {
-        loginToProfile(profile.id)
+        logInToProfile(profile.id)
       }
       else -> launchOnboardingActivity()
     }
@@ -392,7 +392,7 @@ class SplashActivityPresenter @Inject constructor(
     activity.startActivity(intent)
   }
 
-  private fun loginToProfile(profileId: ProfileId) {
+  private fun logInToProfile(profileId: ProfileId) {
     profileManagementController.loginToProfile(profileId).toLiveData().observe(activity) { result ->
       if (result is AsyncResult.Success && !activity.isFinishing) {
         launchHomeScreen(profileId)

app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt

@@ -1086,17 +1086,25 @@ class SplashActivityTest {
   }
 
   @Test
-  @RunOn(TestPlatform.ESPRESSO)
   fun testSplashActivity_onboardingV2Enabled_onboardedSoleLearnerProfile_routesToHomeActivity() {
-    runInNewTestApplication {
-      profileTestHelper.addOnlyAdminProfileWithoutPin()
-      appStartupStateController.markOnboardingFlowCompleted()
-      testCoroutineDispatchers.advanceUntilIdle()
-    }
+    simulateAppAlreadyOnboarded()
     initializeTestApplication(onboardingV2Enabled = true)
+    profileTestHelper.addOnlyAdminProfileWithoutPin()
+    testCoroutineDispatchers.runCurrent()
+
     val profileId = ProfileId.newBuilder().setInternalId(0).build()
-    profileTestHelper.markProfileOnboardingStarted(profileId)
-    profileTestHelper.markProfileOnboardingEnded(profileId)
+    monitorFactory.ensureDataProviderExecutes(
+      profileTestHelper.updateProfileType(profileId, ProfileType.SOLE_LEARNER)
+    )
+
+    monitorFactory.ensureDataProviderExecutes(
+      profileTestHelper.markProfileOnboardingStarted(profileId)
+    )
+    monitorFactory.ensureDataProviderExecutes(
+      profileTestHelper.markProfileOnboardingEnded(profileId)
+    )
+    testCoroutineDispatchers.advanceUntilIdle()
+
     launchSplashActivityPartially {
       intended(hasComponent(HomeActivity::class.java.name))
     }

testing/src/main/java/org/oppia/android/testing/profile/ProfileTestHelper.kt

@@ -70,14 +70,13 @@ class ProfileTestHelper @Inject constructor(
    *
    * @returns the [AsyncResult] designating the result of attempting to log into the admin profile
    */
-  fun addOnlyAdminProfileWithoutPin(): AsyncResult<Any?> {
+  fun addOnlyAdminProfileWithoutPin() {
     addProfileAndWait(
       name = "Admin",
       pin = "",
       allowDownloadAccess = true,
       isAdmin = true
     )
-    return monitorFactory.createMonitor(logIntoAdmin()).waitForNextResult()
   }
 
   /** Create [numProfiles] number of user profiles. */