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 05b47050354..92b871552c1 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 @@ -92,7 +92,6 @@ class ClassroomListActivity : val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(profileId) .setActivityTitle(recentlyPlayedActivityTitle).build() activityRouter.routeToScreen( diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt index 83eabe18b73..edb6bb7792f 100644 --- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt +++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt @@ -96,7 +96,6 @@ class HomeActivity : val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build()) .setActivityTitle(recentlyPlayedActivityTitle).build() activityRouter.routeToScreen( diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt index 9523938373d..d80a6bb351f 100755 --- a/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt +++ b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt @@ -1,12 +1,10 @@ package org.oppia.android.app.home import org.oppia.android.app.model.ExplorationActivityParams -import org.oppia.android.app.model.ProfileId /** Listener for when an activity should route to a exploration. */ interface RouteToExplorationListener { fun routeToExploration( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt index 3450d510fbe..d124746fee6 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt @@ -10,7 +10,6 @@ import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity import org.oppia.android.app.home.RouteToExplorationListener import org.oppia.android.app.model.ExplorationActivityParams import org.oppia.android.app.model.ExplorationCheckpoint -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.RecentlyPlayedActivityParams import org.oppia.android.app.model.ScreenName import org.oppia.android.app.player.exploration.ExplorationActivity @@ -61,7 +60,6 @@ class RecentlyPlayedActivity : } override fun routeToExploration( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -72,7 +70,6 @@ class RecentlyPlayedActivity : startActivity( ExplorationActivity.createExplorationActivityIntent( this, - profileId, classroomId, topicId, storyId, @@ -84,7 +81,6 @@ class RecentlyPlayedActivity : } override fun routeToResumeLesson( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -95,7 +91,6 @@ class RecentlyPlayedActivity : startActivity( ResumeLessonActivity.createResumeLessonActivityIntent( this, - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt index 9eef029e29b..587f8d3d7d2 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt @@ -8,6 +8,7 @@ import org.oppia.android.app.model.RecentlyPlayedActivityParams import org.oppia.android.app.model.RecentlyPlayedActivityTitle import org.oppia.android.app.translation.AppLanguageResourceHandler import org.oppia.android.databinding.RecentlyPlayedActivityBinding +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject /** The presenter for [RecentlyPlayedActivity]. */ @@ -32,7 +33,7 @@ class RecentlyPlayedActivityPresenter @Inject constructor( if (getRecentlyPlayedFragment() == null) { activity.supportFragmentManager.beginTransaction().add( R.id.recently_played_fragment_placeholder, - RecentlyPlayedFragment.newInstance(recentlyPlayedActivityParams.profileId.internalId), + RecentlyPlayedFragment.newInstance(activity.intent.extractCurrentUserProfileId()), RecentlyPlayedFragment.TAG_RECENTLY_PLAYED_FRAGMENT ).commitNow() } diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt index f599f9150e5..3992cf44eaa 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt @@ -10,7 +10,6 @@ import org.oppia.android.app.fragment.InjectableFragment import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.PromotedStory import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId -import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject /** Fragment that contains all recently played stories. */ @@ -19,8 +18,7 @@ class RecentlyPlayedFragment : InjectableFragment(), PromotedStoryClickListener const val TAG_RECENTLY_PLAYED_FRAGMENT = "TAG_RECENTLY_PLAYED_FRAGMENT" /** Returns a new [RecentlyPlayedFragment] to display recently played stories. */ - fun newInstance(internalProfileId: Int): RecentlyPlayedFragment { - val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build() + fun newInstance(profileId: ProfileId): RecentlyPlayedFragment { return RecentlyPlayedFragment().apply { arguments = Bundle().apply { decorateWithUserProfileId(profileId) @@ -42,13 +40,7 @@ class RecentlyPlayedFragment : InjectableFragment(), PromotedStoryClickListener container: ViewGroup?, savedInstanceState: Bundle? ): View? { - val arguments = - checkNotNull(arguments) { "Expected arguments to be passed to RecentlyPlayedFragment" } - val profileId = - arguments.extractCurrentUserProfileId() - - val internalProfileId = profileId.internalId - return recentlyPlayedFragmentPresenter.handleCreateView(inflater, container, internalProfileId) + return recentlyPlayedFragmentPresenter.handleCreateView(inflater, container) } override fun promotedStoryClicked(promotedStory: PromotedStory) { diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt index 98b7617e0eb..c85ce34517e 100755 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt @@ -26,6 +26,8 @@ import org.oppia.android.domain.exploration.lightweightcheckpointing.Exploration import org.oppia.android.domain.oppialogger.OppiaLogger import org.oppia.android.util.data.AsyncResult import org.oppia.android.util.data.DataProviders.Companion.toLiveData +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject /** The presenter for [RecentlyPlayedFragment]. */ @@ -49,9 +51,9 @@ class RecentlyPlayedFragmentPresenter @Inject constructor( fun handleCreateView( inflater: LayoutInflater, container: ViewGroup?, - internalProfileId: Int ): View? { - this.profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build() + + this.profileId = activity.intent.extractCurrentUserProfileId() val recentlyPlayedViewModel = recentlyPlayedViewModelFactory.create( fragment as PromotedStoryClickListener, this.profileId @@ -106,8 +108,8 @@ class RecentlyPlayedFragmentPresenter @Inject constructor( override fun onChanged(it: AsyncResult) { if (it is AsyncResult.Success) { explorationCheckpointLiveData.removeObserver(this) + activity.intent.decorateWithUserProfileId(profileId) routeToResumeLessonListener.routeToResumeLesson( - profileId, promotedStory.classroomId, promotedStory.topicId, promotedStory.storyId, @@ -194,8 +196,8 @@ class RecentlyPlayedFragmentPresenter @Inject constructor( oppiaLogger.e("RecentlyPlayedFragment", "Failed to load exploration", result.error) is AsyncResult.Success -> { oppiaLogger.d("RecentlyPlayedFragment", "Successfully loaded exploration") + activity.intent.decorateWithUserProfileId(profileId) routeToExplorationListener.routeToExploration( - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt index d9519c01e2a..3e98e7b775f 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt @@ -27,6 +27,7 @@ import org.oppia.android.app.topic.conceptcard.ConceptCardListener import org.oppia.android.util.extensions.getProtoExtra import org.oppia.android.util.extensions.putProtoExtra import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject const val TAG_HINTS_AND_SOLUTION_DIALOG = "HINTS_AND_SOLUTION_DIALOG" @@ -59,9 +60,10 @@ class ExplorationActivity : (activityComponent as ActivityComponentImpl).inject(this) val params = intent.extractParams() + val profileId: ProfileId = intent.extractCurrentUserProfileId() explorationActivityPresenter.handleOnCreate( this, - params.profileId, + profileId, params.classroomId, params.topicId, params.storyId, @@ -89,7 +91,6 @@ class ExplorationActivity : */ fun createExplorationActivityIntent( context: Context, - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -98,7 +99,6 @@ class ExplorationActivity : isCheckpointingEnabled: Boolean ): Intent { val params = ExplorationActivityParams.newBuilder().apply { - this.profileId = profileId this.classroomId = classroomId this.topicId = topicId this.storyId = storyId diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt index 42fe0420c7c..c3ceed20b05 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt @@ -188,7 +188,6 @@ class ExplorationActivityPresenter @Inject constructor( activity.supportFragmentManager.beginTransaction().add( R.id.exploration_fragment_placeholder, ExplorationFragment.newInstance( - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt index 6d4cb2a6330..b790a3f5cc1 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt @@ -8,7 +8,6 @@ import android.view.ViewGroup import org.oppia.android.app.fragment.FragmentComponentImpl import org.oppia.android.app.fragment.InjectableFragment import org.oppia.android.app.model.ExplorationFragmentArguments -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.ReadingTextSize import org.oppia.android.util.extensions.putProto import javax.inject.Inject @@ -21,7 +20,6 @@ class ExplorationFragment : InjectableFragment() { companion object { /** Returns a new [ExplorationFragment] with the corresponding fragment parameters. */ fun newInstance( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -29,7 +27,6 @@ class ExplorationFragment : InjectableFragment() { readingTextSize: ReadingTextSize ): ExplorationFragment { val args = ExplorationFragmentArguments.newBuilder().apply { - this.profileId = profileId this.classroomId = classroomId this.topicId = topicId this.storyId = storyId diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt index 207f5bf9e7f..59a79efb648 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt @@ -5,13 +5,13 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageButton +import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.core.view.forEach import androidx.fragment.app.Fragment import org.oppia.android.R import org.oppia.android.app.fragment.FragmentScope import org.oppia.android.app.model.ExplorationFragmentArguments -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.ReadingTextSize import org.oppia.android.app.model.Spotlight import org.oppia.android.app.player.state.StateFragment @@ -28,11 +28,13 @@ import org.oppia.android.util.data.AsyncResult import org.oppia.android.util.data.DataProviders.Companion.toLiveData import org.oppia.android.util.extensions.getProto import org.oppia.android.util.extensions.putProto +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject /** The presenter for [ExplorationFragment]. */ @FragmentScope class ExplorationFragmentPresenter @Inject constructor( + private val activity: AppCompatActivity, private val fragment: Fragment, private val oppiaLogger: OppiaLogger, private val analyticsController: AnalyticsController, @@ -41,7 +43,7 @@ class ExplorationFragmentPresenter @Inject constructor( private val resourceHandler: AppLanguageResourceHandler ) { - private var internalProfileId: Int = -1 + val profileId = activity.intent.extractCurrentUserProfileId() /** Handles the [Fragment.onAttach] portion of [ExplorationFragment]'s lifecycle. */ fun handleAttach(context: Context) { @@ -53,10 +55,9 @@ class ExplorationFragmentPresenter @Inject constructor( val args = retrieveArguments() val binding = ExplorationFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false).root - internalProfileId = args.profileId.internalId val stateFragment = StateFragment.newInstance( - args.profileId.internalId, args.topicId, args.storyId, args.explorationId + profileId.internalId, args.topicId, args.storyId, args.explorationId ) logPracticeFragmentEvent(args.classroomId, args.topicId, args.storyId, args.explorationId) if (getStateFragment() == null) { @@ -70,14 +71,16 @@ class ExplorationFragmentPresenter @Inject constructor( /** Handles the [Fragment.onViewCreated] portion of [ExplorationFragment]'s lifecycle. */ fun handleViewCreated() { - val profileDataProvider = profileManagementController.getProfile(retrieveArguments().profileId) + + val profileDataProvider = profileManagementController.getProfile( + profileId + ) profileDataProvider.toLiveData().observe( fragment ) { result -> val readingTextSize = retrieveArguments().readingTextSize if (result is AsyncResult.Success) { if (result.value.readingTextSize != readingTextSize) { - // Since text views are based on sp for sizing, the activity needs to be recreated so that // sp can be correctly recomputed. selectNewReadingTextSize(result.value.readingTextSize) @@ -161,7 +164,7 @@ class ExplorationFragmentPresenter @Inject constructor( oppiaLogger.createOpenExplorationActivityContext( classroomId, topicId, storyId, explorationId ), - ProfileId.newBuilder().apply { internalId = internalProfileId }.build() + profileId ) } diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt index 6beed9aaf21..b3477ad7018 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt @@ -122,7 +122,7 @@ class StateFragmentTestActivityPresenter @Inject constructor( oppiaLogger.e(TEST_ACTIVITY_TAG, "Failed to load exploration", result.error) is AsyncResult.Success -> { oppiaLogger.d(TEST_ACTIVITY_TAG, "Successfully loaded exploration") - initializeExploration(profileId, topicId, storyId, explorationId) + initializeExploration(topicId, storyId, explorationId) } } } @@ -134,7 +134,6 @@ class StateFragmentTestActivityPresenter @Inject constructor( * session is fully started). */ private fun initializeExploration( - profileId: Int, topicId: String, storyId: String, explorationId: String diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt index b0066ad36f5..184df669977 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt @@ -61,7 +61,6 @@ class ProfileProgressActivity : val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build()) .setActivityTitle(recentlyPlayedActivityTitle) .build() diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt index 4e268b486c2..123c2149641 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt @@ -18,6 +18,7 @@ import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.util.extensions.getProtoExtra import org.oppia.android.util.extensions.putProtoExtra import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject /** Activity that allows the user to resume a saved exploration. */ @@ -33,8 +34,9 @@ class ResumeLessonActivity : (activityComponent as ActivityComponentImpl).inject(this) val params = intent.getProtoExtra(PARAMS_KEY, ResumeLessonActivityParams.getDefaultInstance()) + val profileId: ProfileId = intent.extractCurrentUserProfileId() resumeLessonActivityPresenter.handleOnCreate( - params.profileId, + profileId, params.classroomId, params.topicId, params.storyId, @@ -63,7 +65,6 @@ class ResumeLessonActivity : */ fun createResumeLessonActivityIntent( context: Context, - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -72,7 +73,6 @@ class ResumeLessonActivity : checkpoint: ExplorationCheckpoint ): Intent { val params = ResumeLessonActivityParams.newBuilder().apply { - this.profileId = profileId this.classroomId = classroomId this.topicId = topicId this.storyId = storyId @@ -96,7 +96,6 @@ class ResumeLessonActivity : } override fun routeToExploration( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -108,7 +107,6 @@ class ResumeLessonActivity : startActivity( ExplorationActivity.createExplorationActivityIntent( this, - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt index b09e77fdfce..8054b68b131 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt @@ -84,7 +84,6 @@ class ResumeLessonActivityPresenter @Inject constructor( .remove(getResumeLessonFragment() as Fragment).commitNow() val resumeLessonFragment = ResumeLessonFragment.newInstance( - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt index eb99c0cacf9..cb44b98983a 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt @@ -14,6 +14,7 @@ import org.oppia.android.app.model.ReadingTextSize import org.oppia.android.app.model.ResumeLessonFragmentArguments import org.oppia.android.util.extensions.getProto import org.oppia.android.util.extensions.putProto +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject /** Fragment that allows the user to resume a saved exploration. */ @@ -25,7 +26,6 @@ class ResumeLessonFragment : InjectableFragment() { /** Creates new instance of [ResumeLessonFragment] for the provided parameters. */ fun newInstance( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -35,7 +35,6 @@ class ResumeLessonFragment : InjectableFragment() { readingTextSize: ReadingTextSize ): ResumeLessonFragment { val args = ResumeLessonFragmentArguments.newBuilder().apply { - this.profileId = profileId this.classroomId = classroomId this.topicId = topicId this.storyId = storyId @@ -72,10 +71,13 @@ class ResumeLessonFragment : InjectableFragment() { RESUME_LESSON_FRAGMENT_ARGUMENTS_KEY, ResumeLessonFragmentArguments.getDefaultInstance() ) + val profileId: ProfileId = + activity?.intent?.extractCurrentUserProfileId() ?: ProfileId.getDefaultInstance() + return resumeLessonFragmentPresenter.handleOnCreate( inflater, container, - args.profileId, + profileId, args.classroomId, args.topicId, args.storyId, diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt index 541cfa104ad..4d26ac4cca8 100644 --- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt @@ -26,11 +26,12 @@ import org.oppia.android.util.data.DataProviders.Companion.toLiveData import org.oppia.android.util.extensions.getProto import org.oppia.android.util.gcsresource.DefaultResourceBucketName import org.oppia.android.util.parser.html.HtmlParser +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId import javax.inject.Inject /** The presenter for [ResumeLessonFragment]. */ class ResumeLessonFragmentPresenter @Inject constructor( - activity: AppCompatActivity, + private val activity: AppCompatActivity, private val fragment: Fragment, private val resumeLessonViewModel: ResumeLessonViewModel, private val topicController: TopicController, @@ -212,8 +213,8 @@ class ResumeLessonFragmentPresenter @Inject constructor( oppiaLogger.e("ResumeLessonFragment", "Failed to load exploration", result.error) is AsyncResult.Success -> { oppiaLogger.d("ResumeLessonFragment", "Successfully loaded exploration") + activity.intent.decorateWithUserProfileId(profileId) routeToExplorationListener.routeToExploration( - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt index 43e56fe01c0..cc98c22d65c 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt @@ -54,7 +54,6 @@ class StoryActivity : } override fun routeToExploration( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -65,7 +64,6 @@ class StoryActivity : startActivity( ExplorationActivity.createExplorationActivityIntent( this, - profileId, classroomId, topicId, storyId, @@ -77,7 +75,6 @@ class StoryActivity : } override fun routeToResumeLesson( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -88,7 +85,6 @@ class StoryActivity : startActivity( ResumeLessonActivity.createResumeLessonActivityIntent( this, - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt index 1d9ff2372c8..eedc68dafa5 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt @@ -42,6 +42,7 @@ import org.oppia.android.util.data.DataProviders.Companion.toLiveData import org.oppia.android.util.gcsresource.DefaultResourceBucketName import org.oppia.android.util.parser.html.HtmlParser import org.oppia.android.util.parser.html.TopicHtmlParserEntityType +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId import javax.inject.Inject /** The presenter for [StoryFragment]. */ @@ -127,8 +128,8 @@ class StoryFragmentPresenter @Inject constructor( explorationCheckpoint: ExplorationCheckpoint ) { if (canExplorationBeResumed) { + activity.intent.decorateWithUserProfileId(profileId) routeToResumeLessonListener.routeToResumeLesson( - profileId, classroomId, topicId, storyId, @@ -304,8 +305,8 @@ class StoryFragmentPresenter @Inject constructor( oppiaLogger.e("Story Fragment", "Failed to load exploration", result.error) is AsyncResult.Success -> { oppiaLogger.d("Story Fragment", "Successfully loaded exploration: $explorationId") + activity.intent.decorateWithUserProfileId(profileId) routeToExplorationListener.routeToExploration( - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/survey/SurveyActivity.kt b/app/src/main/java/org/oppia/android/app/survey/SurveyActivity.kt index 12d5b7220ee..c5ab371a5d0 100644 --- a/app/src/main/java/org/oppia/android/app/survey/SurveyActivity.kt +++ b/app/src/main/java/org/oppia/android/app/survey/SurveyActivity.kt @@ -11,6 +11,7 @@ import org.oppia.android.app.model.SurveyActivityParams import org.oppia.android.util.extensions.getProtoExtra import org.oppia.android.util.extensions.putProtoExtra import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject /** The activity for showing a survey. */ @@ -25,7 +26,7 @@ class SurveyActivity : InjectableAutoLocalizedAppCompatActivity() { (activityComponent as ActivityComponentImpl).inject(this) val params = intent.extractParams() - this.profileId = params.profileId ?: ProfileId.newBuilder().setInternalId(-1).build() + this.profileId = intent.extractCurrentUserProfileId() surveyActivityPresenter.handleOnCreate( profileId, @@ -48,12 +49,10 @@ class SurveyActivity : InjectableAutoLocalizedAppCompatActivity() { */ fun createSurveyActivityIntent( context: Context, - profileId: ProfileId, topicId: String, explorationId: String ): Intent { val params = SurveyActivityParams.newBuilder().apply { - this.profileId = profileId this.topicId = topicId this.explorationId = explorationId }.build() diff --git a/app/src/main/java/org/oppia/android/app/survey/SurveyWelcomeDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/survey/SurveyWelcomeDialogFragmentPresenter.kt index 0255528e2fe..68287f3ecdb 100644 --- a/app/src/main/java/org/oppia/android/app/survey/SurveyWelcomeDialogFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/survey/SurveyWelcomeDialogFragmentPresenter.kt @@ -15,6 +15,7 @@ import org.oppia.android.domain.profile.ProfileManagementController import org.oppia.android.domain.survey.SurveyController import org.oppia.android.util.data.AsyncResult import org.oppia.android.util.data.DataProviders.Companion.toLiveData +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId import javax.inject.Inject const val TAG_SURVEY_WELCOME_DIALOG = "SURVEY_WELCOME_DIALOG" @@ -85,8 +86,9 @@ class SurveyWelcomeDialogFragmentPresenter @Inject constructor( } is AsyncResult.Success -> { oppiaLogger.d("SurveyWelcomeDialogFragment", "Successfully started a survey session") + activity.intent.decorateWithUserProfileId(profileId) val intent = - SurveyActivity.createSurveyActivityIntent(activity, profileId, topicId, explorationId) + SurveyActivity.createSurveyActivityIntent(activity, topicId, explorationId) fragment.startActivity(intent) activity.finish() val transaction = activity.supportFragmentManager.beginTransaction() diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt index e16d9e451a6..25097a69343 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt @@ -5,7 +5,6 @@ import org.oppia.android.app.activity.ActivityComponentImpl import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity import org.oppia.android.app.home.RouteToExplorationListener import org.oppia.android.app.model.ExplorationActivityParams -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.topic.TopicFragment import org.oppia.android.app.utility.SplitScreenManager @@ -32,7 +31,6 @@ class ExplorationTestActivity : } override fun routeToExploration( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -43,7 +41,6 @@ class ExplorationTestActivity : startActivity( ExplorationActivity.createExplorationActivityIntent( this, - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt index 196785a2dea..beda5d53f6a 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt @@ -20,6 +20,7 @@ import org.oppia.android.domain.topic.TEST_STORY_ID_0 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 import org.oppia.android.util.data.AsyncResult import org.oppia.android.util.data.DataProviders.Companion.toLiveData +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId import javax.inject.Inject private const val INTERNAL_PROFILE_ID = 0 @@ -68,8 +69,10 @@ class ExplorationTestActivityPresenter @Inject constructor( oppiaLogger.e(TAG_EXPLORATION_TEST_ACTIVITY, "Failed to load exploration", result.error) is AsyncResult.Success -> { oppiaLogger.d(TAG_EXPLORATION_TEST_ACTIVITY, "Successfully loaded exploration") + activity.intent.decorateWithUserProfileId( + ProfileId.newBuilder().setInternalId(INTERNAL_PROFILE_ID).build() + ) routeToExplorationListener.routeToExploration( - ProfileId.newBuilder().apply { internalId = INTERNAL_PROFILE_ID }.build(), CLASSROOM_ID, TOPIC_ID, STORY_ID, diff --git a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt index 7b4fb9d3fef..c93f47f449d 100644 --- a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt @@ -86,7 +86,6 @@ class NavigationDrawerTestActivity : val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build()) .setActivityTitle(recentlyPlayedActivityTitle) .build() diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt index 9c1102e40ab..be9a163d3f0 100644 --- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt @@ -68,7 +68,6 @@ class TopicTestActivity : } override fun routeToExploration( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -79,7 +78,6 @@ class TopicTestActivity : startActivity( ExplorationActivity.createExplorationActivityIntent( this, - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt index 0bb9e20c741..1f02e4c00ab 100644 --- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt +++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt @@ -73,7 +73,6 @@ class TopicTestActivityForStory : } override fun routeToResumeLesson( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -84,7 +83,6 @@ class TopicTestActivityForStory : startActivity( ResumeLessonActivity.createResumeLessonActivityIntent( this, - profileId, classroomId, topicId, storyId, @@ -96,7 +94,6 @@ class TopicTestActivityForStory : } override fun routeToExploration( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -107,7 +104,6 @@ class TopicTestActivityForStory : startActivity( ExplorationActivity.createExplorationActivityIntent( this, - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt index f33511e4591..648fc23c5eb 100644 --- a/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt @@ -2,13 +2,11 @@ package org.oppia.android.app.topic import org.oppia.android.app.model.ExplorationActivityParams import org.oppia.android.app.model.ExplorationCheckpoint -import org.oppia.android.app.model.ProfileId /** Listener for when an activity should route to a [ResumeLessonActivity]. */ interface RouteToResumeLessonListener { /** Called selects an exploration that can be resumed. */ fun routeToResumeLesson( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt index 7da308689d1..ce7b6b913e8 100755 --- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt @@ -106,7 +106,6 @@ class TopicActivity : } override fun routeToExploration( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -117,7 +116,6 @@ class TopicActivity : startActivity( ExplorationActivity.createExplorationActivityIntent( this, - profileId, classroomId, topicId, storyId, @@ -129,7 +127,6 @@ class TopicActivity : } override fun routeToResumeLesson( - profileId: ProfileId, classroomId: String, topicId: String, storyId: String, @@ -140,7 +137,6 @@ class TopicActivity : startActivity( ResumeLessonActivity.createResumeLessonActivityIntent( this, - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt index 1d15dc67ea8..9b52eb08948 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt @@ -31,12 +31,13 @@ import org.oppia.android.util.accessibility.AccessibilityService import org.oppia.android.util.data.AsyncResult import org.oppia.android.util.data.DataProviders.Companion.toLiveData import org.oppia.android.util.enumfilter.filterByEnumCondition +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId import javax.inject.Inject /** The presenter for [TopicLessonsFragment]. */ @FragmentScope class TopicLessonsFragmentPresenter @Inject constructor( - activity: AppCompatActivity, + private val activity: AppCompatActivity, private val fragment: Fragment, private val oppiaLogger: OppiaLogger, private val explorationDataController: ExplorationDataController, @@ -44,7 +45,6 @@ class TopicLessonsFragmentPresenter @Inject constructor( private val topicLessonViewModel: TopicLessonViewModel, private val accessibilityService: AccessibilityService, private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory, - private val singleTypeBuilderFactory: BindableAdapter.SingleTypeBuilder.Factory ) { private val routeToResumeLessonListener = activity as RouteToResumeLessonListener @@ -312,8 +312,8 @@ class TopicLessonsFragmentPresenter @Inject constructor( override fun onChanged(it: AsyncResult) { if (it is AsyncResult.Success) { explorationCheckpointLiveData.removeObserver(this) + activity.intent.decorateWithUserProfileId(profileId) routeToResumeLessonListener.routeToResumeLesson( - profileId, classroomId, topicId, storyId, @@ -400,8 +400,8 @@ class TopicLessonsFragmentPresenter @Inject constructor( oppiaLogger.e("TopicLessonsFragment", "Failed to load exploration", result.error) is AsyncResult.Success -> { oppiaLogger.d("TopicLessonsFragment", "Successfully loaded exploration") + activity.intent.decorateWithUserProfileId(profileId) routeToExplorationListener.routeToExploration( - profileId, classroomId, topicId, storyId, diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt index 345941e95e1..8e4e97396a4 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt @@ -75,7 +75,7 @@ class QuestionPlayerActivityPresenter @Inject constructor( startTrainingSessionWithCallback { activity.supportFragmentManager.beginTransaction().add( R.id.question_player_fragment_placeholder, - QuestionPlayerFragment.newInstance(profileId, readingTextSize), + QuestionPlayerFragment.newInstance(readingTextSize), TAG_QUESTION_PLAYER_FRAGMENT ).commitNow() } @@ -150,7 +150,7 @@ class QuestionPlayerActivityPresenter @Inject constructor( // Re-add the player fragment when the new session is ready. activity.supportFragmentManager.beginTransaction().add( R.id.question_player_fragment_placeholder, - QuestionPlayerFragment.newInstance(profileId, readingTextSize), + QuestionPlayerFragment.newInstance(readingTextSize), TAG_QUESTION_PLAYER_FRAGMENT ).commitNow() } diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt index c825f53e5cf..3da25a20a66 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt @@ -24,6 +24,7 @@ import org.oppia.android.app.player.state.listener.ShowHintAvailabilityListener import org.oppia.android.app.player.state.listener.SubmitNavigationButtonListener import org.oppia.android.util.extensions.getProto import org.oppia.android.util.extensions.putProto +import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId import javax.inject.Inject /** Fragment that contains all questions in Question Player. */ @@ -53,17 +54,13 @@ class QuestionPlayerFragment : container: ViewGroup?, savedInstanceState: Bundle? ): View? { - val args = checkNotNull(arguments) { - "Expected arguments to be passed to QuestionPlayerFragment" - } val userAnswerState = savedInstanceState?.getProto( QUESTION_PLAYER_FRAGMENT_STATE_KEY, UserAnswerState.getDefaultInstance() ) ?: UserAnswerState.getDefaultInstance() - val arguments = - args.getProto(ARGUMENTS_KEY, QuestionPlayerFragmentArguments.getDefaultInstance()) - val profileId = arguments.profileId + val profileId: ProfileId = + activity?.intent?.extractCurrentUserProfileId() ?: ProfileId.getDefaultInstance() return questionPlayerFragmentPresenter.handleCreateView( inflater, container, profileId, userAnswerState ) @@ -120,10 +117,9 @@ class QuestionPlayerFragment : * @param profileId the profile in which the question play session will be played * @return a new [QuestionPlayerFragment] to start a question play session */ - fun newInstance(profileId: ProfileId, readingTextSize: ReadingTextSize): + fun newInstance(readingTextSize: ReadingTextSize): QuestionPlayerFragment { val args = QuestionPlayerFragmentArguments.newBuilder().apply { - this.profileId = profileId this.readingTextSize = readingTextSize }.build() return QuestionPlayerFragment().apply { diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt index b1a9e948d59..b5bda26f38c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt @@ -193,14 +193,12 @@ class RecentlyPlayedFragmentTest { } private fun createRecentlyPlayedActivityIntent( - internalProfileId: Int, recentlyPlayedActivityTitle: RecentlyPlayedActivityTitle = RecentlyPlayedActivityTitle.RECENTLY_PLAYED_STORIES ): Intent { val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build()) .setActivityTitle(recentlyPlayedActivityTitle) .build() return RecentlyPlayedActivity.createRecentlyPlayedActivityIntent( @@ -211,7 +209,7 @@ class RecentlyPlayedFragmentTest { @Test fun testActivity_createIntent_verifyScreenNameInIntent() { - val screenName = createRecentlyPlayedActivityIntent(internalProfileId) + val screenName = createRecentlyPlayedActivityIntent() .extractCurrentAppScreenName() assertThat(screenName).isEqualTo(ScreenName.RECENTLY_PLAYED_ACTIVITY) @@ -220,9 +218,7 @@ class RecentlyPlayedFragmentTest { @Test fun testRecentlyPlayedTestActivity_clickOnToolbarNavigationButton_closeActivity() { activityTestRule.launchActivity( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ) onView(withContentDescription(R.string.navigate_up)).perform(click()) assertThat(activityTestRule.activity.isFinishing).isTrue() @@ -240,9 +236,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView( @@ -268,9 +262,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView( @@ -296,9 +288,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -330,9 +320,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView( @@ -356,7 +344,6 @@ class RecentlyPlayedFragmentTest { ) ActivityScenario.launch( createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId, RecentlyPlayedActivityTitle.STORIES_FOR_YOU ) ).use { @@ -380,9 +367,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -410,9 +395,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView( @@ -435,9 +418,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -466,9 +447,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -495,9 +474,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -530,9 +507,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) activityTestRule.launchActivity( - createRecentlyPlayedActivityIntent( - internalProfileId = profileId.internalId - ) + createRecentlyPlayedActivityIntent() ) activityTestRule.activity.window.decorView.layoutDirection = ViewCompat.LAYOUT_DIRECTION_RTL testCoroutineDispatchers.runCurrent() @@ -571,9 +546,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) activityTestRule.launchActivity( - createRecentlyPlayedActivityIntent( - internalProfileId = profileId.internalId - ) + createRecentlyPlayedActivityIntent() ) activityTestRule.activity.window.decorView.layoutDirection = ViewCompat.LAYOUT_DIRECTION_RTL testCoroutineDispatchers.runCurrent() @@ -619,9 +592,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) activityTestRule.launchActivity( - createRecentlyPlayedActivityIntent( - internalProfileId = profileId.internalId - ) + createRecentlyPlayedActivityIntent() ) activityTestRule.activity.window.decorView.layoutDirection = ViewCompat.LAYOUT_DIRECTION_RTL testCoroutineDispatchers.runCurrent() @@ -673,9 +644,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) activityTestRule.launchActivity( - createRecentlyPlayedActivityIntent( - internalProfileId = profileId.internalId - ) + createRecentlyPlayedActivityIntent() ) activityTestRule.activity.window.decorView.layoutDirection = ViewCompat.LAYOUT_DIRECTION_RTL testCoroutineDispatchers.runCurrent() @@ -724,9 +693,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) activityTestRule.launchActivity( - createRecentlyPlayedActivityIntent( - internalProfileId = profileId.internalId - ) + createRecentlyPlayedActivityIntent() ) testCoroutineDispatchers.runCurrent() val recycler: RecyclerView = @@ -750,9 +717,7 @@ class RecentlyPlayedFragmentTest { ) activityTestRule.launchActivity( - createRecentlyPlayedActivityIntent( - internalProfileId = profileId.internalId - ) + createRecentlyPlayedActivityIntent() ) activityTestRule.activity.window.decorView.layoutDirection = ViewCompat.LAYOUT_DIRECTION_RTL testCoroutineDispatchers.runCurrent() @@ -778,9 +743,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -812,9 +775,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -847,9 +808,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -880,9 +839,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -914,9 +871,7 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -948,9 +903,7 @@ class RecentlyPlayedFragmentTest { FRACTIONS_STORY_0_EXPLORATION_0_CURRENT_VERSION ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -1006,9 +959,8 @@ class RecentlyPlayedFragmentTest { version = 1 // Old version, but it doesn't matter since the new version is incompatible. ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -1046,9 +998,8 @@ class RecentlyPlayedFragmentTest { @Test fun testRecentlyPlayedTestAct_clickStory_chapterAsNotStarted_opensExplorationLessonActivity() { ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -1091,9 +1042,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -1140,9 +1090,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -1174,9 +1123,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -1206,9 +1154,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = false ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1232,9 +1179,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1258,9 +1204,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1291,9 +1236,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1326,9 +1270,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1361,9 +1304,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1397,9 +1339,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1431,9 +1372,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1466,9 +1406,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { onView(isRoot()).perform(orientationLandscape()) testCoroutineDispatchers.runCurrent() @@ -1501,9 +1440,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1536,9 +1474,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -1567,9 +1504,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).perform( @@ -1598,9 +1534,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1630,9 +1565,8 @@ class RecentlyPlayedFragmentTest { timestampOlderThanOneWeek = true ) ActivityScenario.launch( - createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId - ) + createRecentlyPlayedActivityIntent() + ).use { testCoroutineDispatchers.runCurrent() onView(isRoot()).perform(orientationLandscape()) @@ -1654,7 +1588,6 @@ class RecentlyPlayedFragmentTest { fun testFragment_argumentsAreCorrect() { ActivityScenario.launch( createRecentlyPlayedActivityIntent( - internalProfileId = internalProfileId, RecentlyPlayedActivityTitle.STORIES_FOR_YOU ) ).use { scenario -> diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt index e5e87760454..f18933cede0 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt @@ -263,7 +263,6 @@ class ExplorationActivityTest { @Test fun testActivity_createIntent_verifyScreenNameInIntent() { val screenName = createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -279,7 +278,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -298,7 +296,6 @@ class ExplorationActivityTest { fun testExploration_toolbarTitle_isDisplayedSuccessfully() { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -326,7 +323,6 @@ class ExplorationActivityTest { fakeAccessibilityService.setScreenReaderEnabled(false) explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -350,7 +346,6 @@ class ExplorationActivityTest { fakeAccessibilityService.setScreenReaderEnabled(true) explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -374,7 +369,6 @@ class ExplorationActivityTest { fakeAccessibilityService.setScreenReaderEnabled(false) explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -398,7 +392,6 @@ class ExplorationActivityTest { fakeAccessibilityService.setScreenReaderEnabled(true) explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -420,7 +413,6 @@ class ExplorationActivityTest { fun testExploration_configurationChange_toolbarTitle_isDisplayedSuccessfully() { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -448,7 +440,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -478,7 +469,6 @@ class ExplorationActivityTest { markSpotlightSeen(Spotlight.FeatureCase.VOICEOVER_PLAY_ICON) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -509,7 +499,6 @@ class ExplorationActivityTest { markSpotlightSeen(Spotlight.FeatureCase.VOICEOVER_PLAY_ICON) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -533,7 +522,6 @@ class ExplorationActivityTest { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -561,7 +549,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -589,7 +576,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -610,7 +596,6 @@ class ExplorationActivityTest { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -639,7 +624,6 @@ class ExplorationActivityTest { markSpotlightSeen(Spotlight.FeatureCase.LESSONS_BACK_BUTTON) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -668,7 +652,6 @@ class ExplorationActivityTest { markSpotlightSeen(Spotlight.FeatureCase.LESSONS_BACK_BUTTON) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -689,7 +672,6 @@ class ExplorationActivityTest { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -717,7 +699,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -745,7 +726,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -774,7 +754,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -803,7 +782,6 @@ class ExplorationActivityTest { fun testAudioWithNoVoiceover_openPrototypeExploration_checkAudioButtonIsHidden() { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -827,7 +805,6 @@ class ExplorationActivityTest { fun testAudioWithNoVoiceover_prototypeExploration_configChange_checkAudioButtonIsHidden() { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -854,7 +831,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -885,7 +861,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -916,7 +891,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -948,7 +922,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -989,7 +962,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -1037,7 +1009,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -1082,7 +1053,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -1128,7 +1098,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -1169,7 +1138,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1233,7 +1201,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -1279,7 +1246,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1296,7 +1262,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1327,7 +1292,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1358,7 +1322,6 @@ class ExplorationActivityTest { setUpAudio() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, @@ -1398,7 +1361,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1428,7 +1390,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1461,7 +1422,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1503,7 +1463,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1537,7 +1496,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1565,7 +1523,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1600,7 +1557,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1642,7 +1598,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1680,7 +1635,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1719,7 +1673,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1760,7 +1713,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1802,7 +1754,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1843,7 +1794,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1896,7 +1846,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1949,7 +1898,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -1992,7 +1940,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -2026,7 +1973,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -2058,7 +2004,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -2093,7 +2038,6 @@ class ExplorationActivityTest { setUpAudioForFractionLesson() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -2125,7 +2069,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() explorationActivityTestRule.launchActivity( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -2161,7 +2104,6 @@ class ExplorationActivityTest { ) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2193,7 +2135,6 @@ class ExplorationActivityTest { ) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2225,7 +2166,6 @@ class ExplorationActivityTest { ) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2263,7 +2203,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2307,7 +2246,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2345,7 +2283,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2388,7 +2325,6 @@ class ExplorationActivityTest { ) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2426,7 +2362,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2454,7 +2389,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2493,7 +2427,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2532,7 +2465,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2564,7 +2496,6 @@ class ExplorationActivityTest { markAllSpotlightsSeen() launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -2663,7 +2594,6 @@ class ExplorationActivityTest { } private fun createExplorationActivityIntent( - internalProfileId: Int, classroomId: String, topicId: String, storyId: String, @@ -2674,7 +2604,6 @@ class ExplorationActivityTest { // typical route to playing an exploration. return ExplorationActivity.createExplorationActivityIntent( ApplicationProvider.getApplicationContext(), - ProfileId.newBuilder().apply { internalId = internalProfileId }.build(), classroomId, topicId, storyId, diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt index dd3d4d3e0de..531f64ddbdd 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt @@ -684,7 +684,6 @@ class ProfileProgressFragmentTest { ) val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build()) .setActivityTitle(RecentlyPlayedActivityTitle.STORIES_FOR_YOU) .build() clickProfileProgressItem(itemPosition = 0, targetViewId = R.id.view_all_text_view) @@ -720,7 +719,6 @@ class ProfileProgressFragmentTest { ) val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build()) .setActivityTitle(RecentlyPlayedActivityTitle.RECENTLY_PLAYED_STORIES) .build() clickProfileProgressItem(itemPosition = 0, targetViewId = R.id.view_all_text_view) diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt index 6f09f3ec034..a781ba0cf61 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt @@ -40,7 +40,6 @@ import org.oppia.android.app.devoptions.DeveloperOptionsModule import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule import org.oppia.android.app.model.ExplorationActivityParams import org.oppia.android.app.model.ExplorationCheckpoint -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.ScreenName import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule import org.oppia.android.app.shim.ViewBindingShimModule @@ -203,7 +202,6 @@ class ResumeLessonActivityTest { private fun createResumeLessonActivityIntent(): Intent { return ResumeLessonActivity.createResumeLessonActivityIntent( context, - ProfileId.newBuilder().apply { internalId = 1 }.build(), TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt index bd1dc7f6eee..62affec24a8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt @@ -39,7 +39,6 @@ import org.oppia.android.app.devoptions.DeveloperOptionsModule import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule import org.oppia.android.app.model.ExplorationActivityParams import org.oppia.android.app.model.ExplorationCheckpoint -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.ReadingTextSize import org.oppia.android.app.model.ResumeLessonFragmentArguments import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule @@ -288,7 +287,6 @@ class ResumeLessonFragmentTest { ResumeLessonFragment.RESUME_LESSON_FRAGMENT_ARGUMENTS_KEY, ResumeLessonFragmentArguments.getDefaultInstance() ) - val receivedProfileId = args.profileId val receivedClassroomId = args.classroomId val receivedTopicId = args.topicId val receivedStoryId = args.storyId @@ -296,8 +294,6 @@ class ResumeLessonFragmentTest { val receivedParentScreen = args.parentScreen val receivedCheckpoint = args.checkpoint - assertThat(receivedProfileId) - .isEqualTo(ProfileId.newBuilder().apply { internalId = 1 }.build()) assertThat(receivedClassroomId).isEqualTo(TEST_CLASSROOM_ID_1) assertThat(receivedTopicId).isEqualTo(FRACTIONS_TOPIC_ID) assertThat(receivedStoryId).isEqualTo(FRACTIONS_STORY_ID_0) @@ -312,7 +308,6 @@ class ResumeLessonFragmentTest { private fun createResumeLessonActivityIntent(): Intent { return ResumeLessonActivity.createResumeLessonActivityIntent( context, - ProfileId.newBuilder().apply { internalId = 1 }.build(), TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, @@ -325,7 +320,6 @@ class ResumeLessonFragmentTest { private fun createResumeRatiosLessonActivityIntent(): Intent { return ResumeLessonActivity.createResumeLessonActivityIntent( context, - ProfileId.newBuilder().apply { internalId = 1 }.build(), TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0, diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt index 117640c66e7..fc6a620fa3f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt @@ -38,7 +38,6 @@ import org.oppia.android.app.application.testing.TestingBuildFlavorModule import org.oppia.android.app.devoptions.DeveloperOptionsModule import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule import org.oppia.android.app.model.ExplorationActivityParams -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.ScreenName import org.oppia.android.app.player.exploration.ExplorationActivity import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule @@ -207,7 +206,6 @@ class StoryActivityTest { storyId = TEST_STORY_ID_0 topicId = TEST_TOPIC_ID_0 classroomId = TEST_CLASSROOM_ID_0 - profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build() parentScreen = ExplorationActivityParams.ParentScreen.STORY_SCREEN isCheckpointingEnabled = true }.build() diff --git a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt index e2258bdc5d6..caa3f47be66 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyActivityTest.kt @@ -27,7 +27,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule import org.oppia.android.app.application.testing.TestingBuildFlavorModule import org.oppia.android.app.devoptions.DeveloperOptionsModule import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.ScreenName import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule import org.oppia.android.app.shim.ViewBindingShimModule @@ -106,8 +105,6 @@ class SurveyActivityTest { @get:Rule val oppiaTestRule = OppiaTestRule() - private val profileId = ProfileId.newBuilder().setInternalId(0).build() - @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers @@ -136,7 +133,7 @@ class SurveyActivityTest { @Test fun testSurveyActivity_hasCorrectActivityLabel() { - activityTestRule.launchActivity(createSurveyActivityIntent(profileId)) + activityTestRule.launchActivity(createSurveyActivityIntent()) val title = activityTestRule.activity.title // Verify that the activity label is correct as a proxy to verify TalkBack will announce the @@ -147,7 +144,7 @@ class SurveyActivityTest { @Test fun testActivity_createIntent_verifyScreenNameInIntent() { val currentScreenNameWithIntent = SurveyActivity.createSurveyActivityIntent( - context, profileId, TEST_TOPIC_ID_0, TEST_EXPLORATION_ID_2 + context, TEST_TOPIC_ID_0, TEST_EXPLORATION_ID_2 ).extractCurrentAppScreenName() assertThat(currentScreenNameWithIntent).isEqualTo(ScreenName.SURVEY_ACTIVITY) @@ -158,9 +155,9 @@ class SurveyActivityTest { .inject(this) } - private fun createSurveyActivityIntent(profileId: ProfileId): Intent { + private fun createSurveyActivityIntent(): Intent { return SurveyActivity.createSurveyActivityIntent( - context, profileId, TEST_TOPIC_ID_0, TEST_EXPLORATION_ID_2 + context, TEST_TOPIC_ID_0, TEST_EXPLORATION_ID_2 ) } diff --git a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt index 358679a2b35..c7164939f5d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt @@ -609,7 +609,6 @@ class SurveyFragmentTest { private fun createSurveyActivityIntent(): Intent { return SurveyActivity.createSurveyActivityIntent( context = context, - profileId = profileId, TEST_TOPIC_ID_0, TEST_EXPLORATION_ID_2 ) diff --git a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt index d1f06461035..468e5db743e 100644 --- a/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt +++ b/app/src/test/java/org/oppia/android/app/activity/route/ActivityRouterTest.kt @@ -30,7 +30,6 @@ import org.oppia.android.app.devoptions.DeveloperOptionsModule import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity import org.oppia.android.app.model.DestinationScreen -import org.oppia.android.app.model.ProfileId import org.oppia.android.app.model.RecentlyPlayedActivityParams import org.oppia.android.app.model.RecentlyPlayedActivityTitle import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule @@ -129,7 +128,6 @@ class ActivityRouterTest { val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build()) .setActivityTitle(RecentlyPlayedActivityTitle.RECENTLY_PLAYED_STORIES).build() activityRouter.routeToScreen( DestinationScreen diff --git a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt index b5059c0892e..29c5ca5ecc2 100644 --- a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt @@ -155,7 +155,6 @@ class ExplorationActivityLocalTest { ) launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -190,7 +189,6 @@ class ExplorationActivityLocalTest { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -244,7 +242,6 @@ class ExplorationActivityLocalTest { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -289,7 +286,6 @@ class ExplorationActivityLocalTest { launch( createExplorationActivityIntent( - internalProfileId, TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, @@ -377,7 +373,6 @@ class ExplorationActivityLocalTest { } private fun createExplorationActivityIntent( - internalProfileId: Int, classroomId: String, topicId: String, storyId: String, @@ -385,7 +380,6 @@ class ExplorationActivityLocalTest { ): Intent { return ExplorationActivity.createExplorationActivityIntent( ApplicationProvider.getApplicationContext(), - ProfileId.newBuilder().apply { internalId = internalProfileId }.build(), classroomId, topicId, storyId, diff --git a/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt index 538f31e64b9..3514c523ee6 100644 --- a/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt @@ -144,9 +144,7 @@ class RecentlyPlayedSpanTest { @Test fun testRecentlyPlayedSpanTest_checkSpanForItem0_port_hasCorrectSpanCount() { launch( - createRecentlyPlayedActivityIntent( - internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).check( @@ -161,7 +159,7 @@ class RecentlyPlayedSpanTest { @Config(qualifiers = "sw600dp-port") @Test fun testRecentlyPlayedSpanTest_checkSpanForItem0_tablet_hasCorrectSpanCount() { - launch(createRecentlyPlayedActivityIntent(internalProfileId)).use { + launch(createRecentlyPlayedActivityIntent()).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).check( hasGridItemCount( @@ -176,9 +174,7 @@ class RecentlyPlayedSpanTest { @Test fun testRecentlyPlayedSpanTest_checkSpanForItem0_landscape_hasCorrectSpanCount() { launch( - createRecentlyPlayedActivityIntent( - internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).check( @@ -194,9 +190,7 @@ class RecentlyPlayedSpanTest { @Test fun testRecentlyPlayedSpanTest_checkSpanForItem0_landscape_tablet_hasCorrectSpanCount() { launch( - createRecentlyPlayedActivityIntent( - internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).check( @@ -212,9 +206,7 @@ class RecentlyPlayedSpanTest { @Test fun testRecentlyPlayedSpanTest_checkSpanForItem2_port_hasCorrectSpanCount() { launch( - createRecentlyPlayedActivityIntent( - internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).check( @@ -230,9 +222,7 @@ class RecentlyPlayedSpanTest { @Test fun testRecentlyPlayedSpanTest_checkSpanForItem2_tablet_hasCorrectSpanCount() { launch( - createRecentlyPlayedActivityIntent( - internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).check( @@ -248,9 +238,7 @@ class RecentlyPlayedSpanTest { @Test fun testRecentlyPlayedSpanTest_checkSpanForItem2_landscape_hasCorrectSpanCount() { launch( - createRecentlyPlayedActivityIntent( - internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).check( @@ -266,9 +254,7 @@ class RecentlyPlayedSpanTest { @Test fun testRecentlyPlayedSpanTest_checkSpanForItem2_landscape_tablet_hasCorrectSpanCount() { launch( - createRecentlyPlayedActivityIntent( - internalProfileId - ) + createRecentlyPlayedActivityIntent() ).use { testCoroutineDispatchers.runCurrent() onView(withId(R.id.ongoing_story_recycler_view)).check( @@ -280,11 +266,10 @@ class RecentlyPlayedSpanTest { } } - private fun createRecentlyPlayedActivityIntent(profileId: Int): Intent { + private fun createRecentlyPlayedActivityIntent(): Intent { val recentlyPlayedActivityParams = RecentlyPlayedActivityParams .newBuilder() - .setProfileId(ProfileId.newBuilder().setInternalId(profileId).build()) .build() return RecentlyPlayedActivity.createRecentlyPlayedActivityIntent( context, diff --git a/model/src/main/proto/arguments.proto b/model/src/main/proto/arguments.proto index 8540563d3ee..ea50bf99e00 100644 --- a/model/src/main/proto/arguments.proto +++ b/model/src/main/proto/arguments.proto @@ -93,11 +93,9 @@ message DestinationScreen { // Intent extras for RecentlyPlayedActivity. message RecentlyPlayedActivityParams { - // The ID of current profile. - ProfileId profile_id = 1; // The title which should be displayed for the activity. - RecentlyPlayedActivityTitle activity_title = 2; + RecentlyPlayedActivityTitle activity_title = 1; } // Corresponds to activity title of RecentlyPlayedActivity. @@ -120,9 +118,6 @@ enum RecentlyPlayedActivityTitle { // Params required when creating a new ExplorationActivity. message ExplorationActivityParams { - // The ID of the profile that wants to start an exploration play session. - ProfileId profile_id = 1; - // The ID of the classroom to which the opening exploration belongs. string classroom_id = 7; @@ -156,74 +151,65 @@ message ExplorationActivityParams { // Arguments that must be passed to a new ExplorationFragment. message ExplorationFragmentArguments { - // The ID of the profile that wants to start an exploration play session. - ProfileId profile_id = 1; - // The ID of the classroom to which the opening exploration belongs. - string classroom_id = 6; + string classroom_id = 5; // The ID of the topic to which the opening exploration belongs. - string topic_id = 2; + string topic_id = 1; // The ID of the story to which the opening exploration belongs. - string story_id = 3; + string story_id = 2; // The exploration being opened for a new play session. - string exploration_id = 4; + string exploration_id = 3; // The text size at which content in the exploration should be rendered. - ReadingTextSize reading_text_size = 5; + ReadingTextSize reading_text_size = 4; } // Params required when creating a new ResumeLessonActivity. message ResumeLessonActivityParams { - // The ID of the profile that wants to start an exploration play session. - ProfileId profile_id = 1; - // The ID of the classroom to which the opening exploration belongs. - string classroom_id = 7; + string classroom_id = 6; // The ID of the topic to which the opening exploration belongs. - string topic_id = 2; + string topic_id = 1; // The ID of the story to which the opening exploration belongs. - string story_id = 3; + string story_id = 2; // The exploration being opened for a new play session. - string exploration_id = 4; + string exploration_id = 3; // The screen from which this activity was opened. - ExplorationActivityParams.ParentScreen parent_screen = 5; + ExplorationActivityParams.ParentScreen parent_screen = 4; // The checkpoint that may be used to resume the exploration play session. - ExplorationCheckpoint checkpoint = 6; + ExplorationCheckpoint checkpoint = 5; } // Arguments that must be passed to a new ResumeLessonFragment. message ResumeLessonFragmentArguments { - // The ID of the profile that wants to start an exploration play session. - ProfileId profile_id = 1; - // The ID of the classroom to which the opening exploration belongs. - string classroom_id = 7; + string classroom_id = 6; // The ID of the topic to which the opening exploration belongs. - string topic_id = 2; + string topic_id = 1; // The ID of the story to which the opening exploration belongs. - string story_id = 3; + string story_id = 2; // The exploration being opened for a new play session. - string exploration_id = 4; + string exploration_id = 3; // The screen from which this activity was opened. - ExplorationActivityParams.ParentScreen parent_screen = 5; + ExplorationActivityParams.ParentScreen parent_screen = 4; // The checkpoint that may be used to resume the exploration play session. - ExplorationCheckpoint checkpoint = 6; + ExplorationCheckpoint checkpoint = 5; // The text size at which content in the resume lesson should be rendered. - ReadingTextSize reading_text_size = 8; + ReadingTextSize reading_text_size = 7; } // Params required when creating a new ReadingTextSizeActivity. @@ -339,23 +325,19 @@ message AppLanguageActivityStateBundle { // Represents the parameters needed to create SurveyActivity. message SurveyActivityParams { - // The ID of the profile for which the survey is to be shown. - ProfileId profile_id = 1; // The ID of the topic to which the triggering exploration belongs. - string topic_id = 2; + string topic_id = 1; // The ID of the triggering exploration. - string exploration_id = 3; + string exploration_id = 2; } // Arguments required when creating a QuestionPlayerFragment. message QuestionPlayerFragmentArguments{ - // The ID of current profile. - ProfileId profile_id = 1; // The ReadingTextSize previously selected by the user (upon opening the fragment). - ReadingTextSize reading_text_size = 2; + ReadingTextSize reading_text_size = 1; } // Represents the parameters needed to create TopicActivity. diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto index 2b4731054d5..366454b66b3 100644 --- a/scripts/assets/test_file_exemptions.textproto +++ b/scripts/assets/test_file_exemptions.textproto @@ -4098,10 +4098,6 @@ test_file_exemption { exempted_file_path: "testing/src/main/java/org/oppia/android/testing/logging/SyncStatusTestModule.kt" override_min_coverage_percent_required: 0 } -test_file_exemption { - exempted_file_path: "testing/src/main/java/org/oppia/android/testing/math/ComparableOperationSubject.kt" - test_file_not_required: true -} test_file_exemption { exempted_file_path: "testing/src/main/java/org/oppia/android/testing/mockito/MockitoKotlinHelper.kt" test_file_not_required: true diff --git a/testing/src/main/java/org/oppia/android/testing/math/ComparableOperationSubject.kt b/testing/src/main/java/org/oppia/android/testing/math/ComparableOperationSubject.kt index 06dd8bae7ba..cddce924cdb 100644 --- a/testing/src/main/java/org/oppia/android/testing/math/ComparableOperationSubject.kt +++ b/testing/src/main/java/org/oppia/android/testing/math/ComparableOperationSubject.kt @@ -12,8 +12,6 @@ import org.oppia.android.app.model.ComparableOperation.ComparisonTypeCase import org.oppia.android.app.model.Real import org.oppia.android.testing.math.RealSubject.Companion.assertThat -// TODO(#4098): Add tests for this class. - /** * Truth subject for verifying properties of [ComparableOperation]s. * diff --git a/testing/src/test/java/org/oppia/android/testing/math/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/math/BUILD.bazel index cdc91cd8b0f..dce7fbafab7 100644 --- a/testing/src/test/java/org/oppia/android/testing/math/BUILD.bazel +++ b/testing/src/test/java/org/oppia/android/testing/math/BUILD.bazel @@ -112,3 +112,19 @@ oppia_android_test( "//third_party:robolectric_android-all", ], ) + +oppia_android_test( + name = "ComparableOperationSubjectTest", + srcs = ["ComparableOperationSubjectTest.kt"], + custom_package = "org.oppia.android.testing.math", + test_class = "org.oppia.android.testing.math.ComparableOperationSubjectTest", + test_manifest = "//testing:test_manifest", + deps = [ + "//model/src/main/proto:math_java_proto_lite", + "//testing/src/main/java/org/oppia/android/testing/math:comparable_operation_subject", + "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module", + "//third_party:com_google_truth_truth", + "//third_party:junit_junit", + "//third_party:robolectric_android-all", + ], +) diff --git a/testing/src/test/java/org/oppia/android/testing/math/ComparableOperationSubjectTest.kt b/testing/src/test/java/org/oppia/android/testing/math/ComparableOperationSubjectTest.kt new file mode 100644 index 00000000000..ca959aa9647 --- /dev/null +++ b/testing/src/test/java/org/oppia/android/testing/math/ComparableOperationSubjectTest.kt @@ -0,0 +1,431 @@ +package org.oppia.android.testing.math + +import org.junit.Assert.assertThrows +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.oppia.android.app.model.ComparableOperation +import org.oppia.android.app.model.Real +import org.oppia.android.testing.math.ComparableOperationSubject.Companion.assertThat + +/** Tests for [ComparableOperationSubject]. */ +@RunWith(JUnit4::class) +class ComparableOperationSubjectTest { + + private fun createConstantOperation(value: Int): ComparableOperation { + return ComparableOperation.newBuilder() + .setConstantTerm(Real.newBuilder().setInteger(value)) + .build() + } + + private fun createVariableOperation(name: String): ComparableOperation { + return ComparableOperation.newBuilder() + .setVariableTerm(name) + .build() + } + + private fun createCommutativeAccumulation( + type: ComparableOperation.CommutativeAccumulation.AccumulationType, + vararg operations: ComparableOperation + ): ComparableOperation { + val accumulation = ComparableOperation.CommutativeAccumulation.newBuilder() + .setAccumulationType(type) + operations.forEach { accumulation.addCombinedOperations(it) } + return ComparableOperation.newBuilder() + .setCommutativeAccumulation(accumulation) + .build() + } + + @Test + fun testComparableOperationSubject_hasStructureThatMatches() { + val operation = createConstantOperation(42) + + assertThat(operation).hasStructureThatMatches { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(42) + } + } + } + + @Test + fun testComparableOperationSubject_failsWithInvalidStructure() { + val operation = createConstantOperation(42) + assertThrows(AssertionError::class.java) { + assertThat(operation).hasStructureThatMatches { + variableTerm { + withNameThat().isEqualTo("x") + } + } + } + } + + @Test + fun testComparableOperationSubject_hasNegatedProperty_matchesFalse() { + val operation = createConstantOperation(42) + + assertThat(operation).hasStructureThatMatches { + hasNegatedPropertyThat().isFalse() + } + } + + @Test + fun testComparableOperationSubject_hasNegatedPropertyThat_matchesTrue() { + val operation = ComparableOperation.newBuilder() + .setConstantTerm(Real.newBuilder().setInteger(42)) + .setIsNegated(true) + .build() + + assertThat(operation).hasStructureThatMatches { + hasNegatedPropertyThat().isTrue() + } + } + + @Test + fun testComparableOperationSubject_hasInvertedProperty_matchesFalse() { + val operation = createConstantOperation(42) + + assertThat(operation).hasStructureThatMatches { + hasInvertedPropertyThat().isFalse() + } + } + + @Test + fun testComparableOperationSubject_hasInvertedProperty_matchesTrue() { + val operation = ComparableOperation.newBuilder() + .setConstantTerm(Real.newBuilder().setInteger(42)) + .setIsInverted(true) + .build() + + assertThat(operation).hasStructureThatMatches { + hasInvertedPropertyThat().isTrue() + } + } + + @Test + fun testComparableOperationSubject_commutativeAccumulation_withValidSummation() { + val operation = createCommutativeAccumulation( + ComparableOperation.CommutativeAccumulation.AccumulationType.SUMMATION, + createConstantOperation(1), + createConstantOperation(2) + ) + + assertThat(operation).hasStructureThatMatches { + commutativeAccumulationWithType( + ComparableOperation.CommutativeAccumulation + .AccumulationType.SUMMATION + ) { + hasOperandCountThat().isEqualTo(2) + index(0) { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(1) + } + } + index(1) { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(2) + } + } + } + } + } + + @Test + fun testComparableOperationSubject_withEmpty_commutativeAccumulation_hasCorrectStructre() { + val operation = createCommutativeAccumulation( + ComparableOperation.CommutativeAccumulation.AccumulationType.SUMMATION + ) + + assertThat(operation).hasStructureThatMatches { + commutativeAccumulationWithType( + ComparableOperation.CommutativeAccumulation + .AccumulationType.SUMMATION + ) { + hasOperandCountThat().isEqualTo(0) + } + } + } + + @Test + fun testComparableOperationSubject_commutativeAccumulation_failsWithInvalidType() { + val operation = createConstantOperation(42) + assertThrows(AssertionError::class.java) { + assertThat(operation).hasStructureThatMatches { + commutativeAccumulationWithType( + ComparableOperation.CommutativeAccumulation + .AccumulationType.SUMMATION + ) { + hasOperandCountThat().isEqualTo(0) + } + } + } + } + + @Test + fun testComparableOperationSubject_commutativeAccumulation_failsWithInvalidIndex() { + val operation = createCommutativeAccumulation( + ComparableOperation.CommutativeAccumulation.AccumulationType.SUMMATION, + createConstantOperation(1) + ) + assertThrows(IndexOutOfBoundsException::class.java) { + assertThat(operation).hasStructureThatMatches { + commutativeAccumulationWithType( + ComparableOperation.CommutativeAccumulation + .AccumulationType.SUMMATION + ) { + index(1) { } + } + } + } + } + + @Test + fun testComparableOperationSubject_matchesWithValidOperation() { + val operation = ComparableOperation.newBuilder() + .setNonCommutativeOperation( + ComparableOperation.NonCommutativeOperation.newBuilder() + .setExponentiation( + ComparableOperation.NonCommutativeOperation.BinaryOperation.newBuilder() + .setLeftOperand(createConstantOperation(2)) + .setRightOperand(createConstantOperation(3)) + ) + ) + .build() + + assertThat(operation).hasStructureThatMatches { + nonCommutativeOperation { + exponentiation { + leftOperand { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(2) + } + } + rightOperand { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(3) + } + } + } + } + } + } + + @Test + fun testComparableOperationSubject_exponentiation_failsWithInvalidOperation() { + val operation = ComparableOperation.newBuilder() + .setNonCommutativeOperation( + ComparableOperation.NonCommutativeOperation.newBuilder() + .setSquareRoot(createConstantOperation(4)) + ) + .build() + assertThrows(AssertionError::class.java) { + assertThat(operation).hasStructureThatMatches { + nonCommutativeOperation { + exponentiation { } + } + } + } + } + + @Test + fun testComparableOperationSubject_squareRoot_withValidOperation_hasCorrectStructure() { + val operation = ComparableOperation.newBuilder() + .setNonCommutativeOperation( + ComparableOperation.NonCommutativeOperation.newBuilder() + .setSquareRoot(createConstantOperation(4)) + ) + .build() + + assertThat(operation).hasStructureThatMatches { + nonCommutativeOperation { + squareRootWithArgument { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(4) + } + } + } + } + } + + @Test + fun testComparableOperationSubject_squareRoot_failsWithInvalidOperation() { + val operation = ComparableOperation.newBuilder() + .setNonCommutativeOperation( + ComparableOperation.NonCommutativeOperation.newBuilder() + .setExponentiation( + ComparableOperation.NonCommutativeOperation.BinaryOperation.newBuilder() + .setLeftOperand(createConstantOperation(2)) + .setRightOperand(createConstantOperation(3)) + ) + ) + .build() + assertThrows(AssertionError::class.java) { + assertThat(operation).hasStructureThatMatches { + nonCommutativeOperation { + squareRootWithArgument { } + } + } + } + } + + @Test + fun testComparableOperationSubject_binaryOperation_failsWithInvalidLeftOperand() { + val operation = ComparableOperation.newBuilder() + .setNonCommutativeOperation( + ComparableOperation.NonCommutativeOperation.newBuilder() + .setExponentiation( + ComparableOperation.NonCommutativeOperation.BinaryOperation.newBuilder() + .setRightOperand(createConstantOperation(3)) + ) + ) + .build() + assertThrows(AssertionError::class.java) { + assertThat(operation).hasStructureThatMatches { + nonCommutativeOperation { + exponentiation { + leftOperand { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(2) + } + } + } + } + } + } + } + + @Test + fun testComparableOperationSubject_binaryOperation_failsWithInvalidRightOperand() { + val operation = ComparableOperation.newBuilder() + .setNonCommutativeOperation( + ComparableOperation.NonCommutativeOperation.newBuilder() + .setExponentiation( + ComparableOperation.NonCommutativeOperation.BinaryOperation.newBuilder() + .setLeftOperand(createConstantOperation(2)) + ) + ) + .build() + assertThrows(AssertionError::class.java) { + assertThat(operation).hasStructureThatMatches { + nonCommutativeOperation { + exponentiation { + rightOperand { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(3) + } + } + } + } + } + } + } + + @Test + fun testComparableOperationSubject_checksConstantTerm_withValidValue() { + val operation = createConstantOperation(42) + + assertThat(operation).hasStructureThatMatches { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(42) + } + } + } + + @Test + fun testComparableOperationSubject_constantTerm_failsWithInvalidType() { + val operation = createVariableOperation("x") + assertThrows(AssertionError::class.java) { + assertThat(operation).hasStructureThatMatches { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(42) + } + } + } + } + + @Test + fun testComparableOperationSubject_withVariableTerm_hasExpectedName() { + val operation = createVariableOperation("x") + + assertThat(operation).hasStructureThatMatches { + variableTerm { + withNameThat().isEqualTo("x") + } + } + } + + @Test + fun testComparableOperationSubject_variableTerm_failWithInvalidType() { + val operation = createConstantOperation(42) + + assertThrows(AssertionError::class.java) { + assertThat(operation).hasStructureThatMatches { + variableTerm { + withNameThat().isEqualTo("x") + } + } + } + } + + @Test + fun testComparableOperationSubject_complexExpression_withNestedOperations_hasCorrectStructure() { + val operation = createCommutativeAccumulation( + ComparableOperation.CommutativeAccumulation.AccumulationType.PRODUCT, + ComparableOperation.newBuilder() + .setNonCommutativeOperation( + ComparableOperation.NonCommutativeOperation.newBuilder() + .setExponentiation( + ComparableOperation.NonCommutativeOperation.BinaryOperation.newBuilder() + .setLeftOperand(createConstantOperation(2)) + .setRightOperand(createConstantOperation(3)) + ) + ) + .build(), + ComparableOperation.newBuilder() + .setNonCommutativeOperation( + ComparableOperation.NonCommutativeOperation.newBuilder() + .setSquareRoot(createConstantOperation(4)) + ) + .build(), + createVariableOperation("x") + ) + + assertThat(operation).hasStructureThatMatches { + commutativeAccumulationWithType( + ComparableOperation.CommutativeAccumulation + .AccumulationType.PRODUCT + ) { + hasOperandCountThat().isEqualTo(3) + index(0) { + nonCommutativeOperation { + exponentiation { + leftOperand { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(2) + } + } + rightOperand { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(3) + } + } + } + } + } + index(1) { + nonCommutativeOperation { + squareRootWithArgument { + constantTerm { + withValueThat().isIntegerThat().isEqualTo(4) + } + } + } + } + index(2) { + variableTerm { + withNameThat().isEqualTo("x") + } + } + } + } + } +}