Merge branch 'develop' into move-hint-handler-to-domain

Conflicts: app/src/main/java/org/oppia/android/app/application/ApplicationComponent.kt app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt app/src/sharedTest/java/org/oppia/android/app/home/WelcomeViewModelTest.kt app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt app/src/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModelTest.kt app/src/sharedTest/java/org/oppia/android/app/parser/CustomBulletSpanTest.kt app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt app/src/test/java/org/oppia/android/app/testing/HomeSpanTest.kt app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCount.kt app/src/test/java/org/oppia/android/app/testing/RecentlyPlayedSpanTest.kt app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTesting.kt app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt domain/src/test/java/org/oppia/android/domain/question/QuestionTrainingControllerTest.kt
oppia · BenHenning · Aug 19, 2021 · Aug 8, 2021 · Aug 9, 2021 · Aug 9, 2021
commit 028e4cef5dd0c9468a401a847fe21c1db3974b25
@@ -80,7 +80,10 @@ import javax.inject.Singleton
     HintsAndSolutionConfigModule::class, HintsAndSolutionModule::class,
     FirebaseLogUploaderModule::class, NetworkModule::class, PracticeTabModule::class,
     PlatformParameterModule::class, ExplorationStorageModule::class,
-    DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class
+    DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
+    // TODO(#59): Remove this module once we completely migrate to Bazel from Gradle as we can then
+    //  directly exclude debug files from the build and thus won't be requiring this module.
+    NetworkConnectionDebugUtilModule::class
   ]
 )
 interface ApplicationComponent : ApplicationInjector {

@@ -338,7 +338,7 @@ class TopicSummaryViewModelTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -333,7 +333,7 @@ class WelcomeViewModelTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -342,7 +342,7 @@ class PromotedStoryListViewModelTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -353,7 +353,7 @@ class PromotedStoryViewModelTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -227,7 +227,7 @@ class CustomBulletSpanTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
 

@@ -2009,7 +2009,7 @@ class StateFragmentTest {
       WorkManagerConfigurationModule::class, LogUploadWorkerModule::class,
       FirebaseLogUploaderModule::class, FakeOppiaClockModule::class, PracticeTabModule::class,
       DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -302,7 +302,8 @@ class SplashActivityTest {
       HintsAndSolutionModule::class, LogUploadWorkerModule::class,
       WorkManagerConfigurationModule::class, FirebaseLogUploaderModule::class,
       FakeOppiaClockModule::class, PracticeTabModule::class, DeveloperOptionsStarterModule::class,
-      DeveloperOptionsModule::class, ExplorationStorageModule::class
+      DeveloperOptionsModule::class, ExplorationStorageModule::class,
+      NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -129,7 +129,7 @@ class HomeActivityLocalTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionUtilDebugModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -193,7 +193,7 @@ class ExplorationActivityLocalTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -120,7 +120,8 @@ class ProfileChooserFragmentLocalTest {
       HintsAndSolutionModule::class, LogUploadWorkerModule::class,
       WorkManagerConfigurationModule::class, FirebaseLogUploaderModule::class,
       FakeOppiaClockModule::class, PracticeTabModule::class, DeveloperOptionsStarterModule::class,
-      DeveloperOptionsModule::class, ExplorationStorageModule::class
+      DeveloperOptionsModule::class, ExplorationStorageModule::class,
+      NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -151,7 +151,7 @@ class CompletedStoryListSpanTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -165,7 +165,7 @@ class HomeSpanTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -162,7 +162,7 @@ class OngoingTopicListSpanTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionUtilDebugModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -364,7 +364,7 @@ class ProfileChooserSpanTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -147,7 +147,7 @@ class ProfileProgressSpanCount {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -283,7 +283,7 @@ class RecentlyPlayedSpanTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -148,7 +148,7 @@ class TopicRevisionSpanTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -176,7 +176,7 @@ class PlayerSplitScreenTesting {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -189,7 +189,7 @@ class StateFragmentAccessibilityTest {
       WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
       HintsAndSolutionModule::class, FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       PracticeTabModule::class, DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class
+      ExplorationStorageModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -124,7 +124,8 @@ class RevisionCardActivityLocalTest {
       HintsAndSolutionModule::class, LogUploadWorkerModule::class,
       WorkManagerConfigurationModule::class, FirebaseLogUploaderModule::class,
       FakeOppiaClockModule::class, PracticeTabModule::class, DeveloperOptionsStarterModule::class,
-      DeveloperOptionsModule::class, ExplorationStorageModule::class
+      DeveloperOptionsModule::class, ExplorationStorageModule::class,
+      NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : ApplicationComponent {

@@ -75,6 +75,7 @@ import org.robolectric.annotation.LooperMode
 import java.io.FileNotFoundException
 import javax.inject.Inject
 import javax.inject.Singleton
+import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule
 
 /** Tests for [ExplorationDataController]. */
 @RunWith(AndroidJUnit4::class)
@@ -346,7 +347,7 @@ class ExplorationDataControllerTest {
       ImageClickInputModule::class, LogStorageModule::class, TestDispatcherModule::class,
       RatioInputModule::class, RobolectricModule::class, FakeOppiaClockModule::class,
       TestExplorationStorageModule::class, HintsAndSolutionConfigModule::class,
-      HintsAndSolutionModule::class
+      HintsAndSolutionModule::class, NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {

@@ -2953,7 +2953,7 @@ class ExplorationProgressControllerTest {
       ImageClickInputModule::class, LogStorageModule::class, TestDispatcherModule::class,
       RatioInputModule::class, RobolectricModule::class, FakeOppiaClockModule::class,
       TestExplorationStorageModule::class, HintsAndSolutionConfigModule::class,
-      HintsAndSolutionModule::class
+      HintsAndSolutionModule::class, NetworkConnectionUtilDebugModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {

@@ -1881,7 +1881,8 @@ class QuestionAssessmentProgressControllerTest {
       InteractionsModule::class, DragDropSortInputModule::class, TestLogReportingModule::class,
       ImageClickInputModule::class, LogStorageModule::class, TestDispatcherModule::class,
       RatioInputModule::class, RobolectricModule::class, FakeOppiaClockModule::class,
-      CachingTestModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionModule::class
+      CachingTestModule::class, HintsAndSolutionConfigModule::class, HintsAndSolutionModule::class,
+      NetworkConnectionUtilDebugModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {

@@ -335,7 +335,8 @@ class QuestionTrainingControllerTest {
       TestQuestionModule::class, TestLogReportingModule::class, ImageClickInputModule::class,
       LogStorageModule::class, TestDispatcherModule::class, RatioInputModule::class,
       RobolectricModule::class, FakeOppiaClockModule::class, CachingTestModule::class,
-      HintsAndSolutionConfigModule::class, HintsAndSolutionModule::class
+      HintsAndSolutionConfigModule::class, HintsAndSolutionModule::class,
+      NetworkConnectionDebugUtilModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {