Change profile id defaulting to invalid profile

app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt

@@ -56,8 +56,7 @@ class AdministratorControlsFragmentPresenter @Inject constructor(
           /* attachToRoot= */ false
         )
 
-    internalProfileId = activity.intent.extractCurrentUserProfileId().internalId
-    profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+    profileId = activity.intent.extractCurrentUserProfileId()
     administratorControlsViewModel.setProfileId(profileId)
 
     linearLayoutManager = LinearLayoutManager(activity.applicationContext)

app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt

@@ -42,7 +42,7 @@ class ClassroomListActivity :
   @Inject
   lateinit var activityRouter: ActivityRouter
 
-  private var internalProfileId: Int = -1
+  private lateinit var profileId: ProfileId
 
   companion object {
     /** Returns a new [Intent] to route to [ClassroomListActivity] for a specified [profileId]. */
@@ -58,7 +58,7 @@ class ClassroomListActivity :
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
 
-    internalProfileId = intent.extractCurrentUserProfileId().internalId
+    profileId = intent.extractCurrentUserProfileId()
     classroomListActivityPresenter.handleOnCreate()
     title = resourceHandler.getStringInLocale(R.string.classroom_list_activity_title)
   }
@@ -88,7 +88,7 @@ class ClassroomListActivity :
     val recentlyPlayedActivityParams =
       RecentlyPlayedActivityParams
         .newBuilder()
-        .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build())
+        .setProfileId(profileId)
         .setActivityTitle(recentlyPlayedActivityTitle).build()
 
     activityRouter.routeToScreen(

app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt

@@ -103,7 +103,7 @@ class ClassroomListFragmentPresenter @Inject constructor(
       /* attachToRoot= */ false
     )
 
-    internalProfileId = profileId.internalId
+    internalProfileId = profileId.loggedInInternalProfileId
 
     logHomeActivityEvent()
 

app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt

@@ -63,7 +63,8 @@ class ClassroomListViewModel(
   private val dateTimeUtil: DateTimeUtil,
   private val translationController: TranslationController
 ) : ObservableViewModel() {
-  private val profileId: ProfileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+  private val profileId: ProfileId =
+    ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
   private val promotedStoryListLimit = activity.resources.getInteger(
     R.integer.promoted_story_list_limit
   )

app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivity.kt

@@ -21,7 +21,8 @@ class CompletedStoryListActivity : InjectableAutoLocalizedAppCompatActivity() {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
 
-    val internalProfileId: Int = intent?.extractCurrentUserProfileId()?.internalId ?: -1
+    val internalProfileId: Int =
+      intent?.extractCurrentUserProfileId()?.loggedInInternalProfileId ?: -1
     completedStoryListActivityPresenter.handleOnCreate(internalProfileId)
   }
 
@@ -30,7 +31,7 @@ class CompletedStoryListActivity : InjectableAutoLocalizedAppCompatActivity() {
 
     /** Returns a new [Intent] to route to [CompletedStoryListActivity] for a specified profile ID. */
     fun createCompletedStoryListActivityIntent(context: Context, internalProfileId: Int): Intent {
-      val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+      val profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
       val intent = Intent(context, CompletedStoryListActivity::class.java).apply {
         decorateWithUserProfileId(profileId)
         decorateWithScreenName(COMPLETED_STORY_LIST_ACTIVITY)

app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragment.kt

@@ -21,7 +21,7 @@ class CompletedStoryListFragment : InjectableFragment() {
 
     /** Returns a new [CompletedStoryListFragment] to display corresponding to the specified profile ID. */
     fun newInstance(internalProfileId: Int): CompletedStoryListFragment {
-      val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+      val profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
       return CompletedStoryListFragment().apply {
         arguments = Bundle().apply {
           decorateWithUserProfileId(profileId)
@@ -47,11 +47,10 @@ class CompletedStoryListFragment : InjectableFragment() {
       "Expected arguments to be passed to CompletedStoryListFragment"
     }
     val profileId = arguments.extractCurrentUserProfileId()
-    val internalProfileId = profileId.internalId
     return completedStoryListFragmentPresenter.handleCreateView(
       inflater,
       container,
-      internalProfileId
+      profileId
     )
   }
 }

app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt

@@ -7,6 +7,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
 import org.oppia.android.R
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.recyclerview.BindableAdapter
 import org.oppia.android.databinding.CompletedStoryItemBinding
 import org.oppia.android.databinding.CompletedStoryListFragmentBinding
@@ -26,9 +27,9 @@ class CompletedStoryListFragmentPresenter @Inject constructor(
   fun handleCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
-    internalProfileId: Int
+    profileId: ProfileId
   ): View? {
-    viewModel.setProfileId(internalProfileId)
+    viewModel.setProfileId(profileId)
 
     binding = CompletedStoryListFragmentBinding
       .inflate(

app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListViewModel.kt

@@ -26,13 +26,11 @@ class CompletedStoryListViewModel @Inject constructor(
   private val translationController: TranslationController,
   @StoryHtmlParserEntityType private val entityType: String
 ) : ObservableViewModel() {
-  /** [internalProfileId] needs to be set before any of the live data members can be accessed. */
-  private var internalProfileId: Int = -1
+  /** [profileId] needs to be set before any of the live data members can be accessed. */
+  private var profileId: ProfileId = ProfileId.newBuilder().setLoggedOut(true).build()
 
   private val completedStoryListResultLiveData: LiveData<AsyncResult<CompletedStoryList>> by lazy {
-    topicController.getCompletedStoryList(
-      ProfileId.newBuilder().setInternalId(internalProfileId).build()
-    ).toLiveData()
+    topicController.getCompletedStoryList(profileId).toLiveData()
   }
 
   private val completedStoryLiveData: LiveData<CompletedStoryList> by lazy {
@@ -44,9 +42,9 @@ class CompletedStoryListViewModel @Inject constructor(
     Transformations.map(completedStoryLiveData, ::processCompletedStoryList)
   }
 
-  /** Sets internalProfileId to this ViewModel. */
-  fun setProfileId(internalProfileId: Int) {
-    this.internalProfileId = internalProfileId
+  /** Sets profileId to this ViewModel. */
+  fun setProfileId(profileId: ProfileId) {
+    this.profileId = profileId
   }
 
   private fun processCompletedStoryListResult(
@@ -74,7 +72,7 @@ class CompletedStoryListViewModel @Inject constructor(
       completedStoryList.completedStoryList.map { completedStory ->
         CompletedStoryItemViewModel(
           activity,
-          internalProfileId,
+          profileId.loggedInInternalProfileId, // Use the loggedInInternalProfileId
           completedStory,
           entityType,
           intentFactoryShim,

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

@@ -37,35 +37,37 @@ class DeveloperOptionsActivity :
   @Inject
   lateinit var resourceHandler: AppLanguageResourceHandler
 
-  private var internalProfileId = -1
+  private lateinit var profileId: ProfileId
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
-    internalProfileId = intent.extractCurrentUserProfileId().internalId
+    profileId = intent.extractCurrentUserProfileId()
     developerOptionsActivityPresenter.handleOnCreate()
     title = resourceHandler.getStringInLocale(R.string.developer_options_activity_title)
   }
 
   override fun routeToMarkChaptersCompleted() {
-    startActivity(
-      MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
-        context = this, internalProfileId, showConfirmationNotice = false
+    if (!profileId.loggedOut) {
+      startActivity(
+        MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
+          context = this, profileId.loggedInInternalProfileId, showConfirmationNotice = false
+        )
       )
-    )
+    }
   }
 
   override fun routeToMarkStoriesCompleted() {
     startActivity(
       MarkStoriesCompletedActivity
-        .createMarkStoriesCompletedIntent(this, internalProfileId)
+        .createMarkStoriesCompletedIntent(this, profileId.loggedInInternalProfileId)
     )
   }
 
   override fun routeToMarkTopicsCompleted() {
     startActivity(
       MarkTopicsCompletedActivity
-        .createMarkTopicsCompletedIntent(this, internalProfileId)
+        .createMarkTopicsCompletedIntent(this, profileId.loggedInInternalProfileId)
     )
   }
 

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

@@ -68,7 +68,7 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
     this.selectedExplorationIds += selectedExplorationIds
     this.selectedExplorationTitles += selectedExplorationTitles
 
-    profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+    profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
     viewModel.setProfileId(profileId)
 
     linearLayoutManager = LinearLayoutManager(activity.applicationContext)

app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt

@@ -24,15 +24,17 @@ class MarkStoriesCompletedActivity : InjectableAutoLocalizedAppCompatActivity()
   @Inject
   lateinit var resourceHandler: AppLanguageResourceHandler
 
-  private var internalProfileId = -1
+  private var profileId: ProfileId = ProfileId.newBuilder().setLoggedOut(true).build()
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
 
-    val profileId = intent?.extractCurrentUserProfileId()
-    internalProfileId = profileId?.internalId ?: -1
-    markStoriesCompletedActivityPresenter.handleOnCreate(internalProfileId)
+    val currentProfileId = intent?.extractCurrentUserProfileId()
+    profileId = currentProfileId ?: ProfileId.newBuilder().setLoggedOut(true).build()
+    markStoriesCompletedActivityPresenter.handleOnCreate(
+      profileId.loggedInInternalProfileId
+    )
     title = resourceHandler.getStringInLocale(R.string.mark_stories_completed_activity_title)
   }
 
@@ -48,7 +50,7 @@ class MarkStoriesCompletedActivity : InjectableAutoLocalizedAppCompatActivity()
 
     /** Returns an [Intent] to start this activity. */
     fun createMarkStoriesCompletedIntent(context: Context, internalProfileId: Int): Intent {
-      val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+      val profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
       return Intent(context, MarkStoriesCompletedActivity::class.java).apply {
         decorateWithUserProfileId(profileId)
         decorateWithScreenName(MARK_STORIES_COMPLETED_ACTIVITY)

app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragment.kt

@@ -28,7 +28,7 @@ class MarkStoriesCompletedFragment : InjectableFragment() {
 
     /** Returns a new [MarkStoriesCompletedFragment]. */
     fun newInstance(internalProfileId: Int): MarkStoriesCompletedFragment {
-      val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+      val profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
       return MarkStoriesCompletedFragment().apply {
         arguments = Bundle().apply {
           decorateWithUserProfileId(profileId)
@@ -51,7 +51,7 @@ class MarkStoriesCompletedFragment : InjectableFragment() {
       checkNotNull(arguments) { "Expected arguments to be passed to MarkStoriesCompletedFragment" }
 
     val profileId = arguments.extractCurrentUserProfileId()
-    val internalProfileId = profileId.internalId
+    val internalProfileId = profileId.loggedInInternalProfileId
 
     var selectedStoryIdList = ArrayList<String>()
     if (savedInstanceState != null) {

app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragmentPresenter.kt

@@ -52,7 +52,7 @@ class MarkStoriesCompletedFragmentPresenter @Inject constructor(
 
     this.selectedStoryIdList = selectedStoryIdList
 
-    profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+    profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
     viewModel.setProfileId(profileId)
 
     linearLayoutManager = LinearLayoutManager(activity.applicationContext)

app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/testing/MarkStoriesCompletedTestActivity.kt

@@ -24,7 +24,7 @@ class MarkStoriesCompletedTestActivity : InjectableAutoLocalizedAppCompatActivit
     setContentView(R.layout.mark_stories_completed_activity)
 
     val profileId = intent?.extractCurrentUserProfileId()
-    internalProfileId = profileId?.internalId ?: -1
+    internalProfileId = profileId?.loggedInInternalProfileId ?: -1
 
     if (getMarkStoriesCompletedFragment() == null) {
       val markStoriesCompletedFragment = MarkStoriesCompletedFragment.newInstance(internalProfileId)
@@ -44,7 +44,7 @@ class MarkStoriesCompletedTestActivity : InjectableAutoLocalizedAppCompatActivit
 
     /** Returns an [Intent] for [MarkStoriesCompletedTestActivity]. */
     fun createMarkStoriesCompletedTestIntent(context: Context, internalProfileId: Int): Intent {
-      val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+      val profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
       val intent = Intent(context, MarkStoriesCompletedTestActivity::class.java)
       intent.decorateWithUserProfileId(profileId)
       return intent

app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt

@@ -25,14 +25,16 @@ class MarkTopicsCompletedActivity : InjectableAutoLocalizedAppCompatActivity() {
   @Inject
   lateinit var resourceHandler: AppLanguageResourceHandler
 
-  private var internalProfileId = -1
+  private lateinit var profileId: ProfileId
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
-    val profileId = intent?.extractCurrentUserProfileId()
-    internalProfileId = profileId?.internalId ?: -1
-    markTopicsCompletedActivityPresenter.handleOnCreate(internalProfileId)
+    profileId =
+      intent?.extractCurrentUserProfileId() ?: ProfileId.newBuilder().setLoggedOut(true).build()
+    if (!profileId.loggedOut) {
+      markTopicsCompletedActivityPresenter.handleOnCreate(profileId.loggedInInternalProfileId)
+    }
     title = resourceHandler.getStringInLocale(R.string.mark_topics_completed_activity_title)
   }
 
@@ -47,7 +49,7 @@ class MarkTopicsCompletedActivity : InjectableAutoLocalizedAppCompatActivity() {
   companion object {
     /** Returns an [Intent] for [MarkStoriesCompletedTestActivity]. */
     fun createMarkTopicsCompletedIntent(context: Context, internalProfileId: Int): Intent {
-      val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+      val profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
       return Intent(context, MarkTopicsCompletedActivity::class.java).apply {
         decorateWithUserProfileId(profileId)
         decorateWithScreenName(MARK_TOPICS_COMPLETED_ACTIVITY)

app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedFragment.kt

@@ -28,7 +28,7 @@ class MarkTopicsCompletedFragment : InjectableFragment() {
 
     /** Returns a new [MarkTopicsCompletedFragment]. */
     fun newInstance(internalProfileId: Int): MarkTopicsCompletedFragment {
-      val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+      val profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
       return MarkTopicsCompletedFragment().apply {
         arguments = Bundle().apply {
           decorateWithUserProfileId(profileId)
@@ -50,7 +50,7 @@ class MarkTopicsCompletedFragment : InjectableFragment() {
     val arguments =
       checkNotNull(arguments) { "Expected arguments to be passed to MarkTopicsCompletedFragment" }
 
-    val internalProfileId = arguments.extractCurrentUserProfileId().internalId
+    val internalProfileId = arguments.extractCurrentUserProfileId().loggedInInternalProfileId
 
     var selectedTopicIdList = ArrayList<String>()
     if (savedInstanceState != null) {

app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedFragmentPresenter.kt

@@ -52,7 +52,7 @@ class MarkTopicsCompletedFragmentPresenter @Inject constructor(
 
     this.selectedTopicIdList = selectedTopicIdList
 
-    this.profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+    this.profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
     viewModel.setProfileId(profileId)
 
     linearLayoutManager = LinearLayoutManager(activity.applicationContext)

app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/testing/MarkTopicsCompletedTestActivity.kt

@@ -14,18 +14,20 @@ import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extrac
 /** The activity for testing [MarkTopicsCompletedFragment]. */
 class MarkTopicsCompletedTestActivity : InjectableAutoLocalizedAppCompatActivity() {
 
-  private var internalProfileId = -1
+  private var profileId: ProfileId = ProfileId.newBuilder().setLoggedOut(true).build()
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
     supportActionBar?.setDisplayHomeAsUpEnabled(true)
     supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp)
     setContentView(R.layout.mark_topics_completed_activity)
-    val profileId = intent?.extractCurrentUserProfileId()
-    internalProfileId = profileId?.internalId ?: -1
+    val currentProfileId = intent?.extractCurrentUserProfileId()
+    profileId = currentProfileId ?: ProfileId.newBuilder().setLoggedOut(true).build()
     if (getMarkTopicsCompletedFragment() == null) {
-      val markTopicsCompletedFragment = MarkTopicsCompletedFragment.newInstance(internalProfileId)
+      val markTopicsCompletedFragment = MarkTopicsCompletedFragment.newInstance(
+        profileId.loggedInInternalProfileId
+      )
       supportFragmentManager.beginTransaction().add(
         R.id.mark_topics_completed_container,
         markTopicsCompletedFragment
@@ -41,7 +43,7 @@ class MarkTopicsCompletedTestActivity : InjectableAutoLocalizedAppCompatActivity
   companion object {
     /** Returns an [Intent] for [MarkTopicsCompletedTestActivity]. */
     fun createMarkTopicsCompletedTestIntent(context: Context, internalProfileId: Int): Intent {
-      val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+      val profileId = ProfileId.newBuilder().setLoggedInInternalProfileId(internalProfileId).build()
       val intent = Intent(context, MarkTopicsCompletedTestActivity::class.java).apply {
         decorateWithUserProfileId(profileId)
       }