Fix #4833, #4834, #4835, #4838, #1050, #4519, #4522, #4837, #4836, #4855, #4856: Assorted alpha MR6 fixes

app/BUILD.bazel

@@ -189,6 +189,7 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/DeviceIdItemViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt",
+    "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt",
     "src/main/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeViewModel.kt",
     "src/main/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserViewModel.kt",
@@ -200,7 +201,8 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseListViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseTextViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListViewModel.kt",
-    "src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt",
     "src/main/java/org/oppia/android/app/home/HomeViewModel.kt",
     "src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt",
     "src/main/java/org/oppia/android/app/home/promotedlist/ComingSoonTopicsViewModel.kt",
@@ -283,9 +285,9 @@ VIEW_MODELS = [
     "src/main/java/org/oppia/android/app/help/HelpItems.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseItemViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyItemViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt",
     "src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt",
     "src/main/java/org/oppia/android/app/hintsandsolution/ReturnToLessonViewModel.kt",
-    "src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt",
     "src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt",
     "src/main/java/org/oppia/android/app/home/promotedlist/ComingSoonTopicListViewModel.kt",
     "src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt",
@@ -874,6 +876,7 @@ TEST_DEPS = [
     "//testing/src/main/java/org/oppia/android/testing/espresso:konfetti_view_matcher",
     "//testing/src/main/java/org/oppia/android/testing/espresso:text_input_action",
     "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+    "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
     "//testing/src/main/java/org/oppia/android/testing/math:math_equation_subject",
     "//testing/src/main/java/org/oppia/android/testing/math:math_expression_subject",
     "//testing/src/main/java/org/oppia/android/testing/mockito",

app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt

@@ -10,6 +10,7 @@ import org.oppia.android.app.recyclerview.BindableAdapter
 import org.oppia.android.databinding.ProfileAndDeviceIdFragmentBinding
 import org.oppia.android.databinding.ProfileListDeviceIdItemBinding
 import org.oppia.android.databinding.ProfileListLearnerIdItemBinding
+import org.oppia.android.databinding.ProfileListShareIdsItemBinding
 import org.oppia.android.databinding.ProfileListSyncStatusItemBinding
 import javax.inject.Inject
 
@@ -46,27 +47,29 @@ class ProfileAndDeviceIdFragmentPresenter @Inject constructor(
         is DeviceIdItemViewModel -> ProfileListItemViewType.DEVICE_ID
         is ProfileLearnerIdItemViewModel -> ProfileListItemViewType.LEARNER_ID
         is SyncStatusItemViewModel -> ProfileListItemViewType.SYNC_STATUS
+        is ShareIdsViewModel -> ProfileListItemViewType.SHARE_IDS
         else -> error("Encountered unexpected view model: $viewModel")
       }
-    }
-      .registerViewDataBinder(
-        viewType = ProfileListItemViewType.DEVICE_ID,
-        inflateDataBinding = ProfileListDeviceIdItemBinding::inflate,
-        setViewModel = ProfileListDeviceIdItemBinding::setViewModel,
-        transformViewModel = { it as DeviceIdItemViewModel }
-      )
-      .registerViewDataBinder(
-        viewType = ProfileListItemViewType.LEARNER_ID,
-        inflateDataBinding = ProfileListLearnerIdItemBinding::inflate,
-        setViewModel = ProfileListLearnerIdItemBinding::setViewModel,
-        transformViewModel = { it as ProfileLearnerIdItemViewModel }
-      )
-      .registerViewDataBinder(
-        viewType = ProfileListItemViewType.SYNC_STATUS,
-        inflateDataBinding = ProfileListSyncStatusItemBinding::inflate,
-        setViewModel = ProfileListSyncStatusItemBinding::setViewModel,
-        transformViewModel = { it as SyncStatusItemViewModel }
-      )
-      .build()
+    }.registerViewDataBinder(
+      viewType = ProfileListItemViewType.DEVICE_ID,
+      inflateDataBinding = ProfileListDeviceIdItemBinding::inflate,
+      setViewModel = ProfileListDeviceIdItemBinding::setViewModel,
+      transformViewModel = { it as DeviceIdItemViewModel }
+    ).registerViewDataBinder(
+      viewType = ProfileListItemViewType.LEARNER_ID,
+      inflateDataBinding = ProfileListLearnerIdItemBinding::inflate,
+      setViewModel = ProfileListLearnerIdItemBinding::setViewModel,
+      transformViewModel = { it as ProfileLearnerIdItemViewModel }
+    ).registerViewDataBinder(
+      viewType = ProfileListItemViewType.SYNC_STATUS,
+      inflateDataBinding = ProfileListSyncStatusItemBinding::inflate,
+      setViewModel = ProfileListSyncStatusItemBinding::setViewModel,
+      transformViewModel = { it as SyncStatusItemViewModel }
+    ).registerViewDataBinder(
+      viewType = ProfileListItemViewType.SHARE_IDS,
+      inflateDataBinding = ProfileListShareIdsItemBinding::inflate,
+      setViewModel = ProfileListShareIdsItemBinding::setViewModel,
+      transformViewModel = { it as ShareIdsViewModel }
+    ).build()
   }
 }

app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt

@@ -23,20 +23,18 @@ class ProfileListViewModel private constructor(
   private val oppiaLogger: OppiaLogger,
   private val deviceIdItemViewModelFactory: DeviceIdItemViewModel.Factory,
   private val syncStatusItemViewModelFactory: SyncStatusItemViewModel.Factory,
-  private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory
+  private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory,
+  private val shareIdsViewModelFactory: ShareIdsViewModel.Factory
 ) : ObservableViewModel() {
   /** The list of [ProfileListItemViewModel] to display. */
   val profileModels: LiveData<List<ProfileListItemViewModel>> by lazy {
-    Transformations.map(
-      profileManagementController.getProfiles().toLiveData(), ::processProfiles
-    )
+    Transformations.map(profileManagementController.getProfiles().toLiveData(), ::processProfiles)
   }
 
   private fun processProfiles(
     profilesResult: AsyncResult<List<Profile>>
   ): List<ProfileListItemViewModel> {
     val deviceIdViewModel = deviceIdItemViewModelFactory.create()
-    val syncStatusViewModel = syncStatusItemViewModelFactory.create()
 
     val learnerIdModels = when (profilesResult) {
       is AsyncResult.Pending -> listOf()
@@ -56,7 +54,10 @@ class ProfileListViewModel private constructor(
       }
     }
 
-    return listOf(deviceIdViewModel) + learnerIdModels + listOf(syncStatusViewModel)
+    val idModels = listOf(deviceIdViewModel) + learnerIdModels
+    val shareIdsViewModel = shareIdsViewModelFactory.create(idModels)
+    val syncStatusViewModel = syncStatusItemViewModelFactory.create()
+    return idModels + listOf(syncStatusViewModel, shareIdsViewModel)
   }
 
   /**
@@ -80,7 +81,10 @@ class ProfileListViewModel private constructor(
     LEARNER_ID,
 
     /** Corresponds to [SyncStatusItemViewModel]. */
-    SYNC_STATUS
+    SYNC_STATUS,
+
+    /** Corresponds to [ShareIdsViewModel]. */
+    SHARE_IDS
   }
 
   /** Factory to create new [ProfileListViewModel]s. */
@@ -89,7 +93,8 @@ class ProfileListViewModel private constructor(
     private val oppiaLogger: OppiaLogger,
     private val deviceIdItemViewModelFactory: DeviceIdItemViewModel.Factory,
     private val syncStatusItemViewModelFactory: SyncStatusItemViewModel.Factory,
-    private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory
+    private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory,
+    private val shareIdsViewModelFactory: ShareIdsViewModel.Factory
   ) {
     /** Returns a new [ProfileListViewModel]. */
     fun create(): ProfileListViewModel {
@@ -98,7 +103,8 @@ class ProfileListViewModel private constructor(
         oppiaLogger,
         deviceIdItemViewModelFactory,
         syncStatusItemViewModelFactory,
-        profileLearnerIdItemViewModelFactory
+        profileLearnerIdItemViewModelFactory,
+        shareIdsViewModelFactory
       )
     }
   }

app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt

@@ -0,0 +1,58 @@
+package org.oppia.android.app.administratorcontrols.learneranalytics
+
+import android.annotation.SuppressLint
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.app.administratorcontrols.learneranalytics.ProfileListViewModel.ProfileListItemViewModel
+import org.oppia.android.domain.oppialogger.OppiaLogger
+import javax.inject.Inject
+
+/**
+ * [ProfileListItemViewModel] that represents the portion of the learner analytics admin page which
+ * provides a button to the user that allows them to share the device's installation ID, along with
+ * profile IDs, to an external app for record keeping.
+ */
+@SuppressLint("StaticFieldLeak") // False positive (Android doesn't manage this model's lifecycle).
+class ShareIdsViewModel private constructor(
+  private val oppiaLogger: OppiaLogger,
+  private val activity: AppCompatActivity,
+  private val viewModels: List<ProfileListItemViewModel>
+) : ProfileListItemViewModel(ProfileListViewModel.ProfileListItemViewType.SHARE_IDS) {
+  /** Indicates the user wants to share learner & the device IDs with another app. */
+  fun onShareIdsButtonClicked() {
+    // Reference: https://developer.android.com/guide/components/intents-common#Email from
+    // https://stackoverflow.com/a/15022153/3689782.
+    val sharedText = viewModels.mapNotNull { viewModel ->
+      when (viewModel) {
+        is DeviceIdItemViewModel -> "Oppia app installation ID: ${viewModel.deviceId.value}"
+        is ProfileLearnerIdItemViewModel -> {
+          val profile = viewModel.profile
+          "- Profile name: ${profile.name}, learner ID: ${profile.learnerId}"
+        }
+        else -> null
+      }
+    }.joinToString(separator = "\n")
+    try {
+      activity.startActivity(
+        Intent(Intent.ACTION_SEND).apply {
+          type = "text/plain"
+          addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+          putExtra(Intent.EXTRA_TEXT, sharedText)
+        }
+      )
+    } catch (e: ActivityNotFoundException) {
+      oppiaLogger.e("ProfileAndDeviceIdViewModel", "No activity found to receive shared IDs.", e)
+    }
+  }
+
+  /** Factory for creating new [ShareIdsViewModel]s. */
+  class Factory @Inject constructor(
+    private val oppiaLogger: OppiaLogger,
+    private val activity: AppCompatActivity
+  ) {
+    /** Returns a new [ShareIdsViewModel]. */
+    fun create(viewModels: List<ProfileListItemViewModel>): ShareIdsViewModel =
+      ShareIdsViewModel(oppiaLogger, activity, viewModels)
+  }
+}

app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivity.kt

@@ -47,8 +47,9 @@ class DeveloperOptionsActivity :
 
   override fun routeToMarkChaptersCompleted() {
     startActivity(
-      MarkChaptersCompletedActivity
-        .createMarkChaptersCompletedIntent(this, internalProfileId)
+      MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
+        context = this, internalProfileId, showConfirmationNotice = false
+      )
     )
   }
 
@@ -86,10 +87,6 @@ class DeveloperOptionsActivity :
         decorateWithScreenName(DEVELOPER_OPTIONS_ACTIVITY)
       }
     }
-
-    fun getIntentKey(): String {
-      return NAVIGATION_PROFILE_ID_ARGUMENT_KEY
-    }
   }
 
   override fun forceCrash() {

app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt

@@ -21,13 +21,13 @@ class MarkChaptersCompletedActivity : InjectableAppCompatActivity() {
   @Inject
   lateinit var resourceHandler: AppLanguageResourceHandler
 
-  private var internalProfileId = -1
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
-    internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, -1)
-    markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId)
+    val internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, /* defaultValue= */ -1)
+    val showConfirmationNotice =
+      intent.getBooleanExtra(SHOW_CONFIRMATION_NOTICE_EXTRA_KEY, /* defaultValue= */ false)
+    markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId, showConfirmationNotice)
     title = resourceHandler.getStringInLocale(R.string.mark_chapters_completed_activity_title)
   }
 
@@ -39,11 +39,18 @@ class MarkChaptersCompletedActivity : InjectableAppCompatActivity() {
   }
 
   companion object {
-    const val PROFILE_ID_EXTRA_KEY = "MarkChaptersCompletedActivity.profile_id"
-
-    fun createMarkChaptersCompletedIntent(context: Context, internalProfileId: Int): Intent {
+    private const val PROFILE_ID_EXTRA_KEY = "MarkChaptersCompletedActivity.profile_id"
+    private const val SHOW_CONFIRMATION_NOTICE_EXTRA_KEY =
+      "MarkChaptersCompletedActivity.show_confirmation_notice"
+
+    fun createMarkChaptersCompletedIntent(
+      context: Context,
+      internalProfileId: Int,
+      showConfirmationNotice: Boolean
+    ): Intent {
       return Intent(context, MarkChaptersCompletedActivity::class.java).apply {
         putExtra(PROFILE_ID_EXTRA_KEY, internalProfileId)
+        putExtra(SHOW_CONFIRMATION_NOTICE_EXTRA_KEY, showConfirmationNotice)
         decorateWithScreenName(MARK_CHAPTERS_COMPLETED_ACTIVITY)
       }
     }

app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityPresenter.kt

@@ -11,14 +11,14 @@ class MarkChaptersCompletedActivityPresenter @Inject constructor(
   private val activity: AppCompatActivity
 ) {
 
-  fun handleOnCreate(internalProfileId: Int) {
+  fun handleOnCreate(internalProfileId: Int, showConfirmationNotice: Boolean) {
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp)
     activity.setContentView(R.layout.mark_chapters_completed_activity)
 
     if (getMarkChaptersCompletedFragment() == null) {
-      val markChaptersCompletedFragment = MarkChaptersCompletedFragment
-        .newInstance(internalProfileId)
+      val markChaptersCompletedFragment =
+        MarkChaptersCompletedFragment.newInstance(internalProfileId, showConfirmationNotice)
       activity.supportFragmentManager.beginTransaction().add(
         R.id.mark_chapters_completed_container,
         markChaptersCompletedFragment

app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt

@@ -15,17 +15,23 @@ class MarkChaptersCompletedFragment : InjectableFragment() {
   lateinit var markChaptersCompletedFragmentPresenter: MarkChaptersCompletedFragmentPresenter
 
   companion object {
-    internal const val PROFILE_ID_ARGUMENT_KEY =
-      "MarkChaptersCompletedFragment.profile_id"
-
+    private const val PROFILE_ID_ARGUMENT_KEY = "MarkChaptersCompletedFragment.profile_id"
+    private const val SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY =
+      "MarkChaptersCompletedFragment.show_confirmation_notice"
     private const val EXPLORATION_ID_LIST_ARGUMENT_KEY =
       "MarkChaptersCompletedFragment.exploration_id_list"
+    private const val EXPLORATION_TITLE_LIST_ARGUMENT_KEY =
+      "MarkChaptersCompletedFragment.exploration_title_list"
 
     /** Returns a new [MarkChaptersCompletedFragment]. */
-    fun newInstance(internalProfileId: Int): MarkChaptersCompletedFragment {
+    fun newInstance(
+      internalProfileId: Int,
+      showConfirmationNotice: Boolean
+    ): MarkChaptersCompletedFragment {
       val markChaptersCompletedFragment = MarkChaptersCompletedFragment()
       val args = Bundle()
       args.putInt(PROFILE_ID_ARGUMENT_KEY, internalProfileId)
+      args.putBoolean(SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY, showConfirmationNotice)
       markChaptersCompletedFragment.arguments = args
       return markChaptersCompletedFragment
     }
@@ -43,26 +49,28 @@ class MarkChaptersCompletedFragment : InjectableFragment() {
   ): View? {
     val args =
       checkNotNull(arguments) { "Expected arguments to be passed to MarkChaptersCompletedFragment" }
-    val internalProfileId = args
-      .getInt(PROFILE_ID_ARGUMENT_KEY, -1)
-    var selectedExplorationIdList = ArrayList<String>()
-    if (savedInstanceState != null) {
-      selectedExplorationIdList =
-        savedInstanceState.getStringArrayList(EXPLORATION_ID_LIST_ARGUMENT_KEY)!!
-    }
+    val internalProfileId = args.getInt(PROFILE_ID_ARGUMENT_KEY, /* defaultValue= */ -1)
+    val showConfirmationNotice =
+      args.getBoolean(SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY, /* defaultValue= */ false)
     return markChaptersCompletedFragmentPresenter.handleCreateView(
       inflater,
       container,
       internalProfileId,
-      selectedExplorationIdList
+      showConfirmationNotice,
+      savedInstanceState?.getStringArrayList(EXPLORATION_ID_LIST_ARGUMENT_KEY) ?: listOf(),
+      savedInstanceState?.getStringArrayList(EXPLORATION_TITLE_LIST_ARGUMENT_KEY) ?: listOf()
     )
   }
 
   override fun onSaveInstanceState(outState: Bundle) {
     super.onSaveInstanceState(outState)
     outState.putStringArrayList(
       EXPLORATION_ID_LIST_ARGUMENT_KEY,
-      markChaptersCompletedFragmentPresenter.selectedExplorationIdList
+      markChaptersCompletedFragmentPresenter.serializableSelectedExplorationIds
+    )
+    outState.putStringArrayList(
+      EXPLORATION_TITLE_LIST_ARGUMENT_KEY,
+      markChaptersCompletedFragmentPresenter.serializableSelectedExplorationTitles
     )
   }
 }