Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

.github/CODEOWNERS

@@ -250,6 +250,7 @@ WORKSPACE @oppia/android-app-infrastructure-reviewers
 .bazelrc @oppia/android-app-infrastructure-reviewers
 .bazelversion @oppia/android-app-infrastructure-reviewers
 /tools/android/ @oppia/android-app-infrastructure-reviewers
+/tools/kotlin/ @oppia/android-app-infrastructure-reviewers
 
 # Configurations for Bazel-built Android App Bundles.
 /bundle_config.pb.json @oppia/android-dev-workflow-reviewers

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

@@ -138,7 +138,7 @@ class AdministratorControlsActivity :
     if (fragment is ProfileEditFragment) {
       administratorControlsActivityPresenter.handleOnBackPressed()
     } else {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       super.onBackPressed()
     }
   }

app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt

@@ -23,7 +23,7 @@ class AppVersionActivity : InjectableAutoLocalizedAppCompatActivity() {
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivity.kt

@@ -28,7 +28,7 @@ class ProfileAndDeviceIdActivity : InjectableAutoLocalizedAppCompatActivity() {
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

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

@@ -33,7 +33,7 @@ class MarkChaptersCompletedActivity : InjectableAutoLocalizedAppCompatActivity()
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

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

@@ -33,7 +33,7 @@ class MarkStoriesCompletedActivity : InjectableAutoLocalizedAppCompatActivity()
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

app/src/main/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivity.kt

@@ -34,7 +34,7 @@ class MarkTopicsCompletedActivity : InjectableAutoLocalizedAppCompatActivity() {
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       onBackPressed()
     }
     return super.onOptionsItemSelected(item)

app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt

@@ -83,7 +83,7 @@ class OptionsActivity :
     selectedFragment = if (savedInstanceState == null) {
       READING_TEXT_SIZE_FRAGMENT
     } else {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5405): Ensure the correct type is being retrieved.
       savedInstanceState.get(SELECTED_FRAGMENT_SAVED_KEY) as String
     }
     val extraOptionsTitle =

app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt

@@ -28,7 +28,7 @@ class ReadingTextSizeActivityPresenter @Inject constructor(
   private fun setToolbar() {
     val readingTextSizeToolbar: Toolbar = activity.findViewById(R.id.reading_text_size_toolbar)
     readingTextSizeToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       activity.onBackPressed()
     }
   }

app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt

@@ -111,7 +111,7 @@ class ExplorationActivityPresenter @Inject constructor(
     }
 
     binding.explorationToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       activity.onBackPressed()
     }
 

app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt

@@ -431,7 +431,7 @@ class StateFragmentPresenter @Inject constructor(
       activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputManager.hideSoftInputFromWindow(
       fragment.view!!.windowToken,
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5406): Use the correct constant value here.
       InputMethodManager.SHOW_FORCED
     )
   }

app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt

@@ -33,7 +33,7 @@ class ResumeLessonActivityPresenter @Inject constructor(
     activity.setSupportActionBar(resumeLessonToolbar)
 
     resumeLessonToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       activity.onBackPressed()
     }
 

app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt

@@ -48,7 +48,7 @@ class ProfileEditActivity : InjectableAutoLocalizedAppCompatActivity() {
   override fun onBackPressed() {
     val isMultipane = intent.extras!!.getBoolean(IS_MULTIPANE_EXTRA_KEY, false)
     if (isMultipane) {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       super.onBackPressed()
     } else {
       val intent = Intent(this, ProfileListActivity::class.java)

app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt

@@ -26,7 +26,7 @@ class ProfileEditActivityPresenter @Inject constructor(
 
     toolbar.setNavigationOnClickListener {
       if (isMultipane) {
-        @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+        @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
         activity.onBackPressed()
       } else {
         val intent = Intent(activity, ProfileListActivity::class.java)

app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt

@@ -334,7 +334,7 @@ class SurveyFragmentPresenter @Inject constructor(
       activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputManager.hideSoftInputFromWindow(
       fragment.view!!.windowToken,
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5406): Use the correct constant value here.
       InputMethodManager.SHOW_FORCED
     )
   }

app/src/main/java/org/oppia/android/app/testing/FractionInputInteractionViewTestActivity.kt

@@ -3,7 +3,6 @@ package org.oppia.android.app.testing
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityComponentImpl
@@ -60,12 +59,9 @@ class FractionInputInteractionViewTestActivity :
       )
     writtenTranslationContext = params.writtenTranslationContext
     binding.fractionInteractionViewModel = fractionInteractionViewModel
-  }
-
-  /** Checks submit-time errors. */
-  @Suppress("UNUSED_PARAMETER") // TODO: Fix this properly or file a bug.
-  fun getPendingAnswerErrorOnSubmitClick(v: View) {
-    fractionInteractionViewModel.checkPendingAnswerError(AnswerErrorCategory.SUBMIT_TIME)
+    binding.getPendingAnswerErrorOnSubmitClick = Runnable {
+      fractionInteractionViewModel.checkPendingAnswerError(AnswerErrorCategory.SUBMIT_TIME)
+    }
   }
 
   override fun onPendingAnswerErrorOrAvailabilityCheck(

app/src/main/java/org/oppia/android/app/testing/RatioInputInteractionViewTestActivity.kt

@@ -3,7 +3,6 @@ package org.oppia.android.app.testing
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityComponentImpl
@@ -71,15 +70,10 @@ class RatioInputInteractionViewTestActivity :
     writtenTranslationContext = params.writtenTranslationContext
 
     binding.ratioInteractionInputViewModel = ratioExpressionInputInteractionViewModel
-  }
-
-  /**
-   * Checks for submit time errors.
-   */
-  @Suppress("UNUSED_PARAMETER") // TODO: Fix this properly or file a bug.
-  fun getPendingAnswerErrorOnSubmitClick(v: View) {
-    ratioExpressionInputInteractionViewModel
-      .checkPendingAnswerError(AnswerErrorCategory.SUBMIT_TIME)
+    binding.getPendingAnswerErrorOnSubmitClick = Runnable {
+      ratioExpressionInputInteractionViewModel
+        .checkPendingAnswerError(AnswerErrorCategory.SUBMIT_TIME)
+    }
   }
 
   override fun onAnswerReadyForSubmission(answer: UserAnswer) { }

app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivity.kt

@@ -17,7 +17,7 @@ class TestFontScaleConfigurationUtilActivity : InjectableAutoLocalizedAppCompatA
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
-    @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+    @Suppress("DEPRECATION") // TODO(#5405): Ensure the correct type is being retrieved.
     val readingTextSize = checkNotNull(
       intent.getSerializableExtra(FONT_SCALE_EXTRA_KEY) as? ReadingTextSize
     ) { "Expected $FONT_SCALE_EXTRA_KEY to be in intent extras." }

app/src/main/java/org/oppia/android/app/testing/TextInputInteractionViewTestActivity.kt

@@ -1,7 +1,6 @@
 package org.oppia.android.app.testing
 
 import android.os.Bundle
-import android.view.View
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityComponentImpl
@@ -51,12 +50,9 @@ class TextInputInteractionViewTestActivity :
 
     writtenTranslationContext = WrittenTranslationContext.getDefaultInstance()
     binding.textInputViewModel = textInputViewModel
-  }
-
-  /** Checks submit-time errors. */
-  @Suppress("UNUSED_PARAMETER") // TODO: Fix this properly or file a bug.
-  fun getPendingAnswerErrorOnSubmitClick(v: View) {
-    textInputViewModel.checkPendingAnswerError(AnswerErrorCategory.SUBMIT_TIME)
+    binding.getPendingAnswerErrorOnSubmitClick = Runnable {
+      textInputViewModel.checkPendingAnswerError(AnswerErrorCategory.SUBMIT_TIME)
+    }
   }
 
   override fun onPendingAnswerErrorOrAvailabilityCheck(

app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt

@@ -46,8 +46,8 @@ class TopicPracticeFragment : InjectableFragment() {
     var selectedSkillId = HashMap<Int, MutableList<String>>()
     if (savedInstanceState != null) {
       selectedIdList = savedInstanceState.getIntegerArrayList(SUBTOPIC_ID_LIST_ARGUMENT_KEY)!!
-      // TODO(#4437): Convert this to a type-safe proto.
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      // TODO(#4986): Convert this to a type-safe proto.
+      @Suppress("DEPRECATION") // TODO(#5405): Ensure the correct type is being retrieved.
       @Suppress("UNCHECKED_CAST") // Not quite safe.
       selectedSkillId = savedInstanceState
         .getSerializable(SKILL_ID_LIST_ARGUMENT_KEY)!! as HashMap<Int, MutableList<String>>

app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt

@@ -47,7 +47,7 @@ class QuestionPlayerActivityPresenter @Inject constructor(
     activity.setSupportActionBar(binding.questionPlayerToolbar)
 
     binding.questionPlayerToolbar.setNavigationOnClickListener {
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
       activity.onBackPressed()
     }
 

app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt

@@ -315,7 +315,7 @@ class QuestionPlayerFragmentPresenter @Inject constructor(
       activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputManager.hideSoftInputFromWindow(
       fragment.view!!.windowToken,
-      @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+      @Suppress("DEPRECATION") // TODO(#5406): Use the correct constant value here.
       InputMethodManager.SHOW_FORCED
     )
   }

app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt

@@ -106,7 +106,7 @@ class WalkthroughFinalFragmentPresenter @Inject constructor(
   }
 
   override fun goBack() {
-    @Suppress("DEPRECATION") // TODO: Fix this properly or file a bug.
+    @Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
     activity.onBackPressed()
   }
 }

app/src/main/res/layout/activity_fraction_input_interaction_view_test.xml

@@ -10,6 +10,10 @@
     <variable
       name="fractionInteractionViewModel"
       type="org.oppia.android.app.player.state.itemviewmodel.FractionInteractionViewModel" />
+
+    <variable
+      name="getPendingAnswerErrorOnSubmitClick"
+      type="java.lang.Runnable" />
   </data>
 
   <ScrollView
@@ -67,7 +71,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
-        android:onClick="getPendingAnswerErrorOnSubmitClick"
+        android:onClick="@{(v) -> getPendingAnswerErrorOnSubmitClick.run()}"
         android:text="@string/submit_button_text"
         android:textColor="@color/component_color_shared_secondary_4_text_color" />
     </LinearLayout>

app/src/main/res/layout/activity_ratio_input_interaction_view_test.xml

@@ -10,6 +10,10 @@
     <variable
       name="ratioInteractionInputViewModel"
       type="org.oppia.android.app.player.state.itemviewmodel.RatioExpressionInputInteractionViewModel" />
+
+    <variable
+      name="getPendingAnswerErrorOnSubmitClick"
+      type="java.lang.Runnable" />
   </data>
 
   <ScrollView
@@ -67,7 +71,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
-        android:onClick="getPendingAnswerErrorOnSubmitClick"
+        android:onClick="@{(v) -> getPendingAnswerErrorOnSubmitClick.run()}"
         android:text="@string/submit_button_text"
         android:textColor="@color/component_color_shared_secondary_4_text_color" />
     </LinearLayout>

app/src/main/res/layout/activity_text_input_interaction_view_test.xml

@@ -10,6 +10,10 @@
     <variable
       name="textInputViewModel"
       type="org.oppia.android.app.player.state.itemviewmodel.TextInputViewModel" />
+
+    <variable
+      name="getPendingAnswerErrorOnSubmitClick"
+      type="java.lang.Runnable" />
   </data>
 
   <ScrollView
@@ -67,7 +71,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
-        android:onClick="getPendingAnswerErrorOnSubmitClick"
+        android:onClick="@{(v) -> getPendingAnswerErrorOnSubmitClick.run()}"
         android:text="@string/submit_button_text"
         android:textColor="@color/component_color_shared_secondary_4_text_color" />
     </LinearLayout>

domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt

@@ -199,7 +199,6 @@ class AnalyticsController @Inject constructor(
             .addEventLogsToUpload(eventLog)
             .build()
         } else {
-          // TODO(#1433): Refactoring for logging exceptions to both console and exception loggers.
           val exception =
             IllegalStateException("Least Recent Event index absent -- EventLogCacheStoreSize is 0")
           consoleLogger.e("AnalyticsController", "Failure while caching event.", exception)

domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/PerformanceMetricsController.kt

@@ -81,7 +81,6 @@ class PerformanceMetricsController @Inject constructor(
             .addOppiaMetricLog(oppiaMetricLog)
             .build()
         } else {
-          // TODO(#1433): Refactoring for logging exceptions to both console and exception loggers.
           val exception =
             IllegalStateException(
               "Least Recent Event index absent -- MetricLogStorageCacheSize is 0"

domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt

@@ -125,12 +125,12 @@ class ExceptionsController @Inject constructor(
             .addExceptionLog(exceptionLog)
             .build()
         } else {
-          // TODO(#1433): Refactoring for logging exceptions to both console and exception loggers.
           val exception =
             NullPointerException(
               "Least Recent Exception index absent -- ExceptionLogCacheStoreSize is 0"
             )
           consoleLogger.e(EXCEPTIONS_CONTROLLER, exception.toString())
+          exceptionLogger.logException(exception)
         }
       }
       return@storeDataAsync oppiaExceptionLogs.toBuilder().addExceptionLog(exceptionLog).build()