From 27f346cb87caefcd8a011b0a49b97d89a1a449e8 Mon Sep 17 00:00:00 2001 From: Subhajit Mallick <153619690+subhajitxyz@users.noreply.github.com> Date: Tue, 17 Dec 2024 18:24:04 +0530 Subject: [PATCH] Revert "Fix part of #4865: Use profileId in classroom activity and presenter (#5596)" This reverts commit fc2f93261aee0dde12d31f20ac05250a23383e00. --- .../oppia/android/app/classroom/ClassroomListActivity.kt | 6 +++--- .../app/classroom/ClassroomListFragmentPresenter.kt | 7 +++++-- .../oppia/android/app/classroom/ClassroomListViewModel.kt | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt index 5eeb5f498d1..f6160ec4ba7 100644 --- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt +++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt @@ -47,7 +47,7 @@ class ClassroomListActivity : @Inject lateinit var activityRouter: ActivityRouter - private lateinit var profileId: ProfileId + private var internalProfileId: Int = -1 @Inject @field:EnableOnboardingFlowV2 @@ -67,7 +67,7 @@ class ClassroomListActivity : super.onCreate(savedInstanceState) (activityComponent as ActivityComponentImpl).inject(this) - profileId = intent.extractCurrentUserProfileId() + internalProfileId = intent.extractCurrentUserProfileId().internalId classroomListActivityPresenter.handleOnCreate() title = resourceHandler.getStringInLocale(R.string.classroom_list_activity_title) } @@ -92,7 +92,7 @@ class ClassroomListActivity : val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(profileId) + .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build()) .setActivityTitle(recentlyPlayedActivityTitle).build() activityRouter.routeToScreen( diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt index a385a9ff2b9..b0ab600338e 100644 --- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt @@ -99,6 +99,7 @@ class ClassroomListFragmentPresenter @Inject constructor( private val exitProfileListener = activity as ExitProfileListener private lateinit var binding: ClassroomListFragmentBinding private lateinit var classroomListViewModel: ClassroomListViewModel + private var internalProfileId: Int = -1 private val profileId = activity.intent.extractCurrentUserProfileId() private var onBackPressedCallback: OnBackPressedCallback? = null @@ -110,13 +111,15 @@ class ClassroomListFragmentPresenter @Inject constructor( /* attachToRoot= */ false ) + internalProfileId = profileId.internalId + logHomeActivityEvent() classroomListViewModel = ClassroomListViewModel( activity, fragment, oppiaLogger, - profileId, + internalProfileId, profileManagementController, topicListController, classroomController, @@ -174,7 +177,7 @@ class ClassroomListFragmentPresenter @Inject constructor( /** Routes to the play story view for the first story in the given topic summary. */ fun onTopicSummaryClicked(topicSummary: TopicSummary) { routeToTopicPlayStoryListener.routeToTopicPlayStory( - profileId.internalId, + internalProfileId, topicSummary.classroomId, topicSummary.topicId, topicSummary.firstStoryId diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt index 985ed3816c9..8211e52529b 100644 --- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt @@ -53,7 +53,7 @@ class ClassroomListViewModel( private val activity: AppCompatActivity, private val fragment: Fragment, private val oppiaLogger: OppiaLogger, - private val profileId: ProfileId, + private val internalProfileId: Int, private val profileManagementController: ProfileManagementController, private val topicListController: TopicListController, private val classroomController: ClassroomController, @@ -63,7 +63,7 @@ class ClassroomListViewModel( private val dateTimeUtil: DateTimeUtil, private val translationController: TranslationController ) : ObservableViewModel() { - + private val profileId: ProfileId = ProfileId.newBuilder().setInternalId(internalProfileId).build() private val promotedStoryListLimit = activity.resources.getInteger( R.integer.promoted_story_list_limit ) @@ -226,7 +226,7 @@ class ClassroomListViewModel( .mapIndexed { index, promotedStory -> PromotedStoryViewModel( activity, - profileId.internalId, + internalProfileId, sortedStoryList.size, storyEntityType, promotedStory,