Fix #3813, #92, part of #4044: Refactor AsyncResult into a sealed class

WORKSPACE

@@ -129,6 +129,15 @@ git_repository(
     remote = "https://github.com/oppia/androidsvg",
 )
 
+# A custom fork of KotliTeX that removes resources artifacts that break the build, and updates the
+# min target SDK version to be compatible with Oppia.
+git_repository(
+    name = "kotlitex",
+    commit = "ba51aaca442d248b7b44b4eeb5bb9846ad45b245",
+    remote = "https://github.com/oppia/kotlitex",
+    shallow_since = "1645642252 -0800",
+)
+
 bind(
     name = "databinding_annotation_processor",
     actual = "//tools/android:compiler_annotation_processor",

app/BUILD.bazel

@@ -189,7 +189,7 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt",
     "src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt",
     "src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt",
-    "src/main/java/org/oppia/android/app/parser/StringToFractionParser.kt",
+    "src/main/java/org/oppia/android/app/parser/FractionParsingUiError.kt",
     "src/main/java/org/oppia/android/app/parser/StringToNumberParser.kt",
     "src/main/java/org/oppia/android/app/parser/StringToRatioParser.kt",
     "src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt",
@@ -546,8 +546,8 @@ android_library(
         ":views",
         "//app/src/main/java/org/oppia/android/app/translation:app_language_activity_injector_provider",
         "//app/src/main/java/org/oppia/android/app/translation:app_language_resource_handler",
-        "//model:interaction_object_java_proto_lite",
-        "//model:thumbnail_java_proto_lite",
+        "//model/src/main/proto:interaction_object_java_proto_lite",
+        "//model/src/main/proto:thumbnail_java_proto_lite",
         "//third_party:androidx_annotation_annotation",
         "//third_party:androidx_constraintlayout_constraintlayout",
         "//third_party:androidx_core_core",
@@ -578,8 +578,8 @@ kt_android_library(
     deps = [
         ":dagger",
         "//domain/src/main/java/org/oppia/android/domain/audio:cellular_audio_dialog_controller",
-        "//model:question_java_proto_lite",
-        "//model:topic_java_proto_lite",
+        "//model/src/main/proto:question_java_proto_lite",
+        "//model/src/main/proto:topic_java_proto_lite",
         "//third_party:androidx_recyclerview_recyclerview",
     ],
 )
@@ -658,6 +658,7 @@ kt_android_library(
         "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions",
         "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_event_logger",
         "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module",
+        "//utility/src/main/java/org/oppia/android/util/math:fraction_parser",
         # TODO(#59): Remove 'debug_util_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.
         "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module",
@@ -686,7 +687,7 @@ android_library(
         ":view_models",
         "//app/src/main/java/org/oppia/android/app/translation:app_language_activity_injector_provider",
         "//app/src/main/java/org/oppia/android/app/translation:app_language_resource_handler",
-        "//model:thumbnail_java_proto_lite",
+        "//model/src/main/proto:thumbnail_java_proto_lite",
         "//third_party:androidx_annotation_annotation",
         "//third_party:androidx_constraintlayout_constraintlayout",
         "//third_party:androidx_lifecycle_lifecycle-livedata-core",
@@ -732,13 +733,16 @@ kt_android_library(
         "//data/src/main/java/org/oppia/android/data/backends/gae:network_config_prod_module",
         "//data/src/main/java/org/oppia/android/data/backends/gae:prod_module",
         "//domain/src/main/java/org/oppia/android/domain/classify:interactions_module",
+        "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction:continue_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput:drag_and_drop_sort_input_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput:fraction_input_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput:image_click_input_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput:item_selection_input_module",
+        "//domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput:math_equation_input_rule_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput:multiple_choice_input_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits:number_with_units_rule_module",
+        "//domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput:numeric_expression_input_rule_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput:numeric_input_rule_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput:ratio_input_module",
         "//domain/src/main/java/org/oppia/android/domain/classify/rules/textinput:text_input_rule_module",
@@ -749,8 +753,8 @@ kt_android_library(
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:startup_listener",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions:logger_module",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader:worker_module",
+        "//model/src/main/proto:arguments_java_proto_lite",
         "//domain/src/main/java/org/oppia/android/domain/profile:profile_management_controller",
-        "//model:arguments_java_proto_lite",
         "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
         "//third_party:androidx_databinding_databinding-adapters",
         "//third_party:androidx_databinding_databinding-common",
@@ -778,7 +782,9 @@ kt_android_library(
         "//utility/src/main/java/org/oppia/android/util/parser/image:image_parsing_module",
         # TODO(#2432): Replace debug_module with prod_module when building the app in prod mode.
         "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+        "//utility/src/main/java/org/oppia/android/util/logging:console_logger_injector_provider",
         "//utility/src/main/java/org/oppia/android/util/statusbar:status_bar_color",
+        "//utility/src/main/java/org/oppia/android/util/threading:dispatcher_injector_provider",
     ],
 )
 
@@ -822,15 +828,19 @@ TEST_DEPS = [
     ":test_deps",
     "//app/src/main/java/org/oppia/android/app/testing/activity:test_activity",
     "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
+    "//app/src/main/java/org/oppia/android/app/utility/math:math_expression_accessibility_util",
     "//domain",
     "//domain/src/main/java/org/oppia/android/domain/audio:audio_player_controller",
+    "//domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput:algebraic_expression_input_rule_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction:continue_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput:drag_and_drop_sort_input_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput:fraction_input_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput:image_click_input_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput:item_selection_input_module",
+    "//domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput:math_equation_input_rule_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput:multiple_choice_input_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits:number_with_units_rule_module",
+    "//domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput:numeric_expression_input_rule_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput:numeric_input_rule_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput:ratio_input_module",
     "//domain/src/main/java/org/oppia/android/domain/classify/rules/textinput:text_input_rule_module",
@@ -844,6 +854,8 @@ TEST_DEPS = [
     "//testing/src/main/java/org/oppia/android/testing/espresso:konfetti_view_matcher",
     "//testing/src/main/java/org/oppia/android/testing/espresso:text_input_action",
     "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+    "//testing/src/main/java/org/oppia/android/testing/math:math_equation_subject",
+    "//testing/src/main/java/org/oppia/android/testing/math:math_expression_subject",
     "//testing/src/main/java/org/oppia/android/testing/mockito",
     "//testing/src/main/java/org/oppia/android/testing/network",
     "//testing/src/main/java/org/oppia/android/testing/network:test_module",
@@ -879,6 +891,7 @@ TEST_DEPS = [
     "//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
     "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
     "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module",
+    "//utility/src/main/java/org/oppia/android/util/math:math_expression_parser",
     "//utility/src/main/java/org/oppia/android/util/parser/html:custom_bullet_span",
     "//utility/src/main/java/org/oppia/android/util/parser/html:html_parser",
     "//utility/src/main/java/org/oppia/android/util/parser/html:html_parser_entity_type_module",

app/src/main/java/org/oppia/android/app/activity/BUILD.bazel

@@ -75,6 +75,6 @@ kt_android_library(
         "//app:app_visibility",
     ],
     deps = [
-        "//model:profile_java_proto_lite",
+        "//model/src/main/proto:profile_java_proto_lite",
     ],
 )

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

@@ -51,14 +51,16 @@ class AdministratorControlsViewModel @Inject constructor(
   private fun processGetDeviceSettingsResult(
     deviceSettingsResult: AsyncResult<DeviceSettings>
   ): DeviceSettings {
-    if (deviceSettingsResult.isFailure()) {
-      oppiaLogger.e(
-        "AdministratorControlsFragment",
-        "Failed to retrieve profile",
-        deviceSettingsResult.getErrorOrNull()!!
-      )
+    return when (deviceSettingsResult) {
+      is AsyncResult.Failure -> {
+        oppiaLogger.e(
+          "AdministratorControlsFragment", "Failed to retrieve profile", deviceSettingsResult.error
+        )
+        DeviceSettings.getDefaultInstance()
+      }
+      is AsyncResult.Pending -> DeviceSettings.getDefaultInstance()
+      is AsyncResult.Success -> deviceSettingsResult.value
     }
-    return deviceSettingsResult.getOrDefault(DeviceSettings.getDefaultInstance())
   }
 
   private fun processAdministratorControlsList(

app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt

@@ -7,6 +7,7 @@ import org.oppia.android.app.model.DeviceSettings
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.profile.ProfileManagementController
+import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 
 /** [ViewModel] for the recycler view in [AdministratorControlsFragment]. */
@@ -31,11 +32,11 @@ class AdministratorControlsDownloadPermissionsViewModel(
       .observe(
         fragment,
         Observer {
-          if (it.isFailure()) {
+          if (it is AsyncResult.Failure) {
             oppiaLogger.e(
               "AdministratorControlsFragment",
               "Failed to update topic update on wifi permission",
-              it.getErrorOrNull()!!
+              it.error
             )
           }
         }
@@ -49,11 +50,11 @@ class AdministratorControlsDownloadPermissionsViewModel(
     ).toLiveData().observe(
       fragment,
       Observer {
-        if (it.isFailure()) {
+        if (it is AsyncResult.Failure) {
           oppiaLogger.e(
             "AdministratorControlsFragment",
             "Failed to update topic auto update permission",
-            it.getErrorOrNull()!!
+            it.error
           )
         }
       }

app/src/main/java/org/oppia/android/app/application/ApplicationComponent.kt

@@ -14,13 +14,16 @@ import org.oppia.android.app.translation.ActivityRecreatorProdModule
 import org.oppia.android.data.backends.gae.NetworkConfigProdModule
 import org.oppia.android.data.backends.gae.NetworkModule
 import org.oppia.android.domain.classify.InteractionsModule
+import org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputModule
 import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule
 import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule
 import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule
 import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule
 import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule
+import org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputModule
 import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule
 import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule
+import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputModule
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
@@ -93,6 +96,8 @@ import javax.inject.Singleton
     DeveloperOptionsModule::class, PlatformParameterSyncUpWorkerModule::class,
     NetworkConnectionUtilDebugModule::class, NetworkConfigProdModule::class, AssetModule::class,
     LocaleProdModule::class, ActivityRecreatorProdModule::class,
+    NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class,
+    MathEquationInputModule::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

app/src/main/java/org/oppia/android/app/application/ApplicationInjector.kt

@@ -3,11 +3,15 @@ package org.oppia.android.app.application
 import org.oppia.android.app.translation.AppLanguageApplicationInjector
 import org.oppia.android.domain.locale.LocaleApplicationInjector
 import org.oppia.android.util.data.DataProvidersInjector
+import org.oppia.android.util.logging.ConsoleLoggerInjector
 import org.oppia.android.util.system.OppiaClockInjector
+import org.oppia.android.util.threading.DispatcherInjector
 
 /** Injector for application-level dependencies that can't be directly injected where needed. */
 interface ApplicationInjector :
   DataProvidersInjector,
   AppLanguageApplicationInjector,
   OppiaClockInjector,
-  LocaleApplicationInjector
+  LocaleApplicationInjector,
+  DispatcherInjector,
+  ConsoleLoggerInjector

app/src/main/java/org/oppia/android/app/application/ApplicationInjectorProvider.kt

@@ -6,15 +6,21 @@ import org.oppia.android.domain.locale.LocaleApplicationInjector
 import org.oppia.android.domain.locale.LocaleApplicationInjectorProvider
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
+import org.oppia.android.util.logging.ConsoleLoggerInjector
+import org.oppia.android.util.logging.ConsoleLoggerInjectorProvider
 import org.oppia.android.util.system.OppiaClockInjector
 import org.oppia.android.util.system.OppiaClockInjectorProvider
+import org.oppia.android.util.threading.DispatcherInjector
+import org.oppia.android.util.threading.DispatcherInjectorProvider
 
 /** Provider for [ApplicationInjector]. The application context will implement this interface. */
 interface ApplicationInjectorProvider :
   DataProvidersInjectorProvider,
   AppLanguageApplicationInjectorProvider,
   OppiaClockInjectorProvider,
-  LocaleApplicationInjectorProvider {
+  LocaleApplicationInjectorProvider,
+  DispatcherInjectorProvider,
+  ConsoleLoggerInjectorProvider {
   fun getApplicationInjector(): ApplicationInjector
 
   override fun getDataProvidersInjector(): DataProvidersInjector = getApplicationInjector()
@@ -25,4 +31,8 @@ interface ApplicationInjectorProvider :
   override fun getOppiaClockInjector(): OppiaClockInjector = getApplicationInjector()
 
   override fun getLocaleApplicationInjector(): LocaleApplicationInjector = getApplicationInjector()
+
+  override fun getDispatcherInjector(): DispatcherInjector = getApplicationInjector()
+
+  override fun getConsoleLoggerInjector(): ConsoleLoggerInjector = getApplicationInjector()
 }

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

@@ -48,14 +48,18 @@ class CompletedStoryListViewModel @Inject constructor(
   private fun processCompletedStoryListResult(
     completedStoryListResult: AsyncResult<CompletedStoryList>
   ): CompletedStoryList {
-    if (completedStoryListResult.isFailure()) {
-      oppiaLogger.e(
-        "CompletedStoryListFragment",
-        "Failed to retrieve CompletedStory list: ",
-        completedStoryListResult.getErrorOrNull()!!
-      )
+    return when (completedStoryListResult) {
+      is AsyncResult.Failure -> {
+        oppiaLogger.e(
+          "CompletedStoryListFragment",
+          "Failed to retrieve CompletedStory list: ",
+          completedStoryListResult.error
+        )
+        CompletedStoryList.getDefaultInstance()
+      }
+      is AsyncResult.Pending -> CompletedStoryList.getDefaultInstance()
+      is AsyncResult.Success -> completedStoryListResult.value
     }
-    return completedStoryListResult.getOrDefault(CompletedStoryList.getDefaultInstance())
   }
 
   private fun processCompletedStoryList(

app/src/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt

@@ -20,6 +20,8 @@ import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard
 //  background="@drawable/edit_text_background"
 //  maxLength="200".
 
+// TODO(#4135): Add a dedicated test suite for this class.
+
 /** The custom EditText class for fraction input interaction view. */
 class FractionInputInteractionView @JvmOverloads constructor(
   context: Context,

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

@@ -48,14 +48,16 @@ class MarkChaptersCompletedViewModel @Inject constructor(
   private fun processStoryMapResult(
     storyMap: AsyncResult<Map<String, List<StorySummary>>>
   ): Map<String, List<StorySummary>> {
-    if (storyMap.isFailure()) {
-      oppiaLogger.e(
-        "MarkChaptersCompletedFragment",
-        "Failed to retrieve storyList",
-        storyMap.getErrorOrNull()!!
-      )
+    return when (storyMap) {
+      is AsyncResult.Failure -> {
+        oppiaLogger.e(
+          "MarkChaptersCompletedFragment", "Failed to retrieve storyList", storyMap.error
+        )
+        mapOf()
+      }
+      is AsyncResult.Pending -> mapOf()
+      is AsyncResult.Success -> storyMap.value
     }
-    return storyMap.getOrDefault(mapOf())
   }
 
   private fun processStoryMap(

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

@@ -48,14 +48,16 @@ class MarkStoriesCompletedViewModel @Inject constructor(
   private fun processStoryMapResult(
     storyMap: AsyncResult<Map<String, List<StorySummary>>>
   ): Map<String, List<StorySummary>> {
-    if (storyMap.isFailure()) {
-      oppiaLogger.e(
-        "MarkStoriesCompletedFragment",
-        "Failed to retrieve storyList",
-        storyMap.getErrorOrNull()!!
-      )
+    return when (storyMap) {
+      is AsyncResult.Failure -> {
+        oppiaLogger.e(
+          "MarkStoriesCompletedFragment", "Failed to retrieve storyList", storyMap.error
+        )
+        mapOf()
+      }
+      is AsyncResult.Pending -> mapOf()
+      is AsyncResult.Success -> storyMap.value
     }
-    return storyMap.getOrDefault(mapOf())
   }
 
   private fun processStoryMap(