Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix part of #4865: Use profileId in classroom activity and presenter #5596

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Fix part of #4865: Use profileId in classroom activity and presenter #5596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ClassroomListActivity :
@Inject
lateinit var activityRouter: ActivityRouter

private var internalProfileId: Int = -1
private lateinit var profileId: ProfileId

@Inject
@field:EnableOnboardingFlowV2
Expand All @@ -67,7 +67,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)
}
Expand All @@ -92,7 +92,7 @@ class ClassroomListActivity :
val recentlyPlayedActivityParams =
RecentlyPlayedActivityParams
.newBuilder()
.setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build())
.setProfileId(profileId)
.setActivityTitle(recentlyPlayedActivityTitle).build()

activityRouter.routeToScreen(
Expand Down
7 changes: 2 additions & 5 deletions app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ 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

Expand All @@ -111,15 +110,13 @@ class ClassroomListFragmentPresenter @Inject constructor(
/* attachToRoot= */ false
)

internalProfileId = profileId.internalId

logHomeActivityEvent()

classroomListViewModel = ClassroomListViewModel(
activity,
fragment,
oppiaLogger,
internalProfileId,
profileId,
profileManagementController,
topicListController,
classroomController,
Expand Down Expand Up @@ -177,7 +174,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(
internalProfileId,
profileId.internalId,
topicSummary.classroomId,
topicSummary.topicId,
topicSummary.firstStoryId
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class ClassroomListViewModel(
private val activity: AppCompatActivity,
private val fragment: Fragment,
private val oppiaLogger: OppiaLogger,
private val internalProfileId: Int,
private val profileId: ProfileId,
private val profileManagementController: ProfileManagementController,
private val topicListController: TopicListController,
private val classroomController: ClassroomController,
Expand All @@ -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
)
Expand Down Expand Up @@ -226,7 +226,7 @@ class ClassroomListViewModel(
.mapIndexed { index, promotedStory ->
PromotedStoryViewModel(
activity,
internalProfileId,
profileId.internalId,
sortedStoryList.size,
storyEntityType,
promotedStory,
Expand Down
Loading