Fix #52: Finalize release 0.11

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

@@ -14,9 +14,11 @@ import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
+import org.oppia.android.util.locale.OppiaLocale
 import org.oppia.android.util.logging.SyncStatusManager
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus
 import java.io.ByteArrayOutputStream
+import java.security.MessageDigest
 import java.util.Base64
 import java.util.zip.GZIPOutputStream
 import javax.inject.Inject
@@ -31,6 +33,7 @@ class ControlButtonsViewModel private constructor(
   private val activity: AppCompatActivity,
   private val analyticsController: AnalyticsController,
   private val syncStatusManager: SyncStatusManager,
+  private val machineLocale: OppiaLocale.MachineLocale,
   private val viewModels: List<ProfileListItemViewModel>
 ) : ProfileListItemViewModel(ProfileListViewModel.ProfileListItemViewType.SHARE_IDS) {
   private var monitoredUploadProgress: LiveData<ForceSyncProgress> =
@@ -73,10 +76,17 @@ class ControlButtonsViewModel private constructor(
           )
         }
         is SyncStatusItemViewModel -> {
+          val halfLineCount = BASE64_LINE_WRAP_LIMIT / 2
+          val logsStr = logs?.toCompressedBase64()
           listOf(
             "Current sync status: ${viewModel.syncStatus.value}.",
+            "Event log encoding integrity checks:",
+            "- First $halfLineCount chars of encoded string: ${logsStr?.take(halfLineCount)}",
+            "- Last $halfLineCount chars of encoded string: ${logsStr?.takeLast(halfLineCount)}",
+            "- SHA-1 hash (unwrapped event string): ${logsStr?.computeSha1Hash(machineLocale)}",
+            "- Total event string length (unwrapped): ${logsStr?.length}",
             "Encoded event logs:"
-          ) + (logs?.toCompressedBase64()?.chunked(BASE64_LINE_WRAP_LIMIT) ?: listOf("Missing"))
+          ) + (logsStr?.chunked(BASE64_LINE_WRAP_LIMIT) ?: listOf("Missing"))
         }
         else -> null
       }
@@ -198,12 +208,13 @@ class ControlButtonsViewModel private constructor(
     private val oppiaLogger: OppiaLogger,
     private val activity: AppCompatActivity,
     private val analyticsController: AnalyticsController,
-    private val syncStatusManager: SyncStatusManager
+    private val syncStatusManager: SyncStatusManager,
+    private val machineLocale: OppiaLocale.MachineLocale
   ) {
     /** Returns a new [ControlButtonsViewModel]. */
     fun create(viewModels: List<ProfileListItemViewModel>): ControlButtonsViewModel {
       return ControlButtonsViewModel(
-        oppiaLogger, activity, analyticsController, syncStatusManager, viewModels
+        oppiaLogger, activity, analyticsController, syncStatusManager, machineLocale, viewModels
       )
     }
   }
@@ -219,5 +230,13 @@ class ControlButtonsViewModel private constructor(
       }.toByteArray()
       return Base64.getEncoder().encodeToString(compressedMessage)
     }
+
+    private fun String.computeSha1Hash(machineLocale: OppiaLocale.MachineLocale): String {
+      return machineLocale.run {
+        MessageDigest.getInstance("SHA-1")
+          .digest(this@computeSha1Hash.toByteArray())
+          .joinToString("") { "%02x".formatForMachines(it) }
+      }
+    }
   }
 }

app/src/main/java/org/oppia/android/app/application/alpha/AlphaApplicationComponent.kt

@@ -37,7 +37,7 @@ import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterM
 import org.oppia.android.domain.oppialogger.exceptions.UncaughtExceptionLoggerModule
 import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule
 import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule
-import org.oppia.android.domain.platformparameter.PlatformParameterModule
+import org.oppia.android.domain.platformparameter.PlatformParameterAlphaModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
 import org.oppia.android.domain.platformparameter.syncup.PlatformParameterSyncUpWorkerModule
 import org.oppia.android.domain.question.QuestionModule
@@ -85,7 +85,7 @@ import javax.inject.Singleton
     ApplicationStartupListenerModule::class, LogReportWorkerModule::class,
     WorkManagerConfigurationModule::class, HintsAndSolutionConfigModule::class,
     FirebaseLogUploaderModule::class, NetworkModule::class,
-    PlatformParameterModule::class, PlatformParameterSingletonModule::class,
+    PlatformParameterAlphaModule::class, PlatformParameterSingletonModule::class,
     ExplorationStorageModule::class, DeveloperOptionsModule::class,
     PlatformParameterSyncUpWorkerModule::class, NetworkConfigProdModule::class, AssetModule::class,
     LocaleProdModule::class, ActivityRecreatorProdModule::class, ActivityRouterModule::class,

app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt

@@ -427,7 +427,9 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
 
         override fun onDrawerClosed(drawerView: View) {
           super.onDrawerClosed(drawerView)
-          fragment.activity!!.invalidateOptionsMenu()
+          // It's possible in some rare cases for the activity to be gone while the drawer is
+          // closing (possibly an out-of-lifecycle call from the AndroidX component).
+          fragment.activity?.invalidateOptionsMenu()
           StatusBarColor.statusBarColorUpdate(
             R.color.component_color_shared_activity_status_bar_color,
             activity,

app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt

@@ -41,7 +41,8 @@ class PromotedStoryViewModel(
 
   /**
    * Starts [ResumeLessonActivity] if a saved exploration is selected or [ExplorationActivity] if an
-   * un-started recommended story is selected.   */
+   * un-started recommended story is selected.
+   */
   fun clickOnPromotedStoryTile(@Suppress("UNUSED_PARAMETER") v: View) {
     promotedStoryClickListener.promotedStoryClicked(promotedStory)
   }

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

@@ -29,7 +29,7 @@ private const val OPTIONS_ITEM_VIEW_MODEL_LIST_PROVIDER_ID =
 /** Options settings view model for the recycler view in [OptionsFragment]. */
 @FragmentScope
 class OptionControlsViewModel @Inject constructor(
-  val activity: AppCompatActivity,
+  activity: AppCompatActivity,
   private val profileManagementController: ProfileManagementController,
   private val oppiaLogger: OppiaLogger,
   @EnableLanguageSelectionUi private val enableLanguageSelectionUi: PlatformParameterValue<Boolean>,

app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt

@@ -175,6 +175,8 @@ class AudioFragmentPresenter @Inject constructor(
       AudioLanguage.FRENCH_AUDIO_LANGUAGE -> "fr"
       AudioLanguage.CHINESE_AUDIO_LANGUAGE -> "zh"
       AudioLanguage.BRAZILIAN_PORTUGUESE_LANGUAGE -> "pt"
+      AudioLanguage.ARABIC_LANGUAGE -> "ar"
+      AudioLanguage.NIGERIAN_PIDGIN_LANGUAGE -> "pcm"
       AudioLanguage.NO_AUDIO, AudioLanguage.UNRECOGNIZED, AudioLanguage.AUDIO_LANGUAGE_UNSPECIFIED,
       AudioLanguage.ENGLISH_AUDIO_LANGUAGE -> "en"
     }

app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt

@@ -8,7 +8,10 @@ import androidx.appcompat.view.ContextThemeWrapper
 import org.oppia.android.R
 import org.oppia.android.app.fragment.FragmentComponentImpl
 import org.oppia.android.app.fragment.InjectableDialogFragment
-import java.util.Locale
+import org.oppia.android.app.model.AudioLanguage
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import org.oppia.android.util.locale.OppiaLocale
+import javax.inject.Inject
 import kotlin.collections.ArrayList
 
 private const val LANGUAGE_LIST_ARGUMENT_KEY = "LanguageDialogFragment.language_list"
@@ -18,6 +21,9 @@ private const val SELECTED_INDEX_ARGUMENT_KEY = "LanguageDialogFragment.selected
  * DialogFragment that controls language selection in audio and written translations.
  */
 class LanguageDialogFragment : InjectableDialogFragment() {
+  @Inject lateinit var appLanguageResourceHandler: AppLanguageResourceHandler
+  @Inject lateinit var machineLocale: OppiaLocale.MachineLocale
+
   companion object {
     /**
      * This function is responsible for displaying content in DialogFragment.
@@ -55,13 +61,21 @@ class LanguageDialogFragment : InjectableDialogFragment() {
     val languageNameArrayList = ArrayList<String>()
 
     for (languageCode in languageCodeArrayList) {
+      val audioLanguage = when (machineLocale.run { languageCode.toMachineLowerCase() }) {
+        "hi" -> AudioLanguage.HINDI_AUDIO_LANGUAGE
+        "fr" -> AudioLanguage.FRENCH_AUDIO_LANGUAGE
+        "zh" -> AudioLanguage.CHINESE_AUDIO_LANGUAGE
+        "pt", "pt-br" -> AudioLanguage.BRAZILIAN_PORTUGUESE_LANGUAGE
+        "ar" -> AudioLanguage.ARABIC_LANGUAGE
+        "pcm" -> AudioLanguage.NIGERIAN_PIDGIN_LANGUAGE
+        else -> AudioLanguage.ENGLISH_AUDIO_LANGUAGE
+      }
       if (languageCode == "hi-en") {
         languageNameArrayList.add("Hinglish")
       } else {
-        // TODO(#3791): Remove this dependency.
-        val locale = Locale(languageCode)
-        val name = locale.getDisplayLanguage(locale)
-        languageNameArrayList.add(name)
+        languageNameArrayList.add(
+          appLanguageResourceHandler.computeLocalizedDisplayName(audioLanguage)
+        )
       }
     }
 

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

@@ -26,7 +26,7 @@ import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.locale.OppiaLocale
-import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
+import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLesson
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
 
@@ -39,7 +39,8 @@ class StateViewModel @Inject constructor(
   private val oppiaLogger: OppiaLogger,
   private val fragment: Fragment,
   private val profileManagementController: ProfileManagementController,
-  @EnableLearnerStudyAnalytics private val enableLearnerStudy: PlatformParameterValue<Boolean>
+  @EnableFastLanguageSwitchingInLesson
+  private val enableFastLanguageSwitchingInLesson: PlatformParameterValue<Boolean>
 ) : ObservableViewModel() {
   val itemList: ObservableList<StateItemViewModel> = ObservableArrayList()
   val rightItemList: ObservableList<StateItemViewModel> = ObservableArrayList()
@@ -52,7 +53,7 @@ class StateViewModel @Inject constructor(
   val isHintBulbVisible = ObservableField(false)
   val isHintOpenedAndUnRevealed = ObservableField(false)
 
-  val hasSupportForSwitchingToSwahili: Boolean = enableLearnerStudy.value
+  val hasSupportForSwitchingToSwahili: Boolean = enableFastLanguageSwitchingInLesson.value
   val hasSwahiliTranslations: LiveData<Boolean> by lazy {
     Transformations.map(
       explorationProgressController.getCurrentState().toLiveData(),

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

@@ -11,6 +11,7 @@ import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.platformparameter.EnableDownloadsSupport
+import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLesson
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
@@ -21,15 +22,18 @@ class ProfileEditViewModel @Inject constructor(
   private val oppiaLogger: OppiaLogger,
   private val profileManagementController: ProfileManagementController,
   @EnableDownloadsSupport private val enableDownloadsSupport: PlatformParameterValue<Boolean>,
-  @EnableLearnerStudyAnalytics private val enableLearnerStudy: PlatformParameterValue<Boolean>
+  @EnableLearnerStudyAnalytics private val enableLearnerStudy: PlatformParameterValue<Boolean>,
+  @EnableFastLanguageSwitchingInLesson
+  private val enableFastLanguageSwitchingInLesson: PlatformParameterValue<Boolean>
 ) : ObservableViewModel() {
   private lateinit var profileId: ProfileId
 
   /** Whether the admin is allowed to mark chapters as finished. */
   val isAllowedToMarkFinishedChapters: Boolean = enableLearnerStudy.value
 
   /** Whether the admin can allow learners to quickly switch content languages within a lesson. */
-  val isAllowedToEnableQuickLessonLanguageSwitching: Boolean = enableLearnerStudy.value
+  val isAllowedToEnableQuickLessonLanguageSwitching: Boolean =
+    enableFastLanguageSwitchingInLesson.value
 
   /** List of all the current profiles registered in the app [ProfileListFragment]. */
   val profile: LiveData<Profile> by lazy {

app/src/main/java/org/oppia/android/app/spotlight/SpotlightFragment.kt

@@ -154,7 +154,7 @@ class SpotlightFragment : InjectableFragment(), SpotlightNavigationListener, Spo
     if (targetList.isNullOrEmpty()) return
     spotlight = Spotlight.Builder(activity)
       .setTargets(targetList)
-      .setBackgroundColorRes(R.color.component_color_shared_close_spotlight_button_color)
+      .setBackgroundColorRes(R.color.component_color_shared_spotlight_overlay_background_color)
       .setDuration(500L)
       .setAnimation(AccelerateInterpolator(0.5f))
       .setOnSpotlightListener(object : OnSpotlightListener {

app/src/main/java/org/oppia/android/app/translation/AppLanguageResourceHandler.kt

@@ -157,6 +157,9 @@ class AppLanguageResourceHandler @Inject constructor(
       AudioLanguage.FRENCH_AUDIO_LANGUAGE -> getLocalizedDisplayName("fr")
       AudioLanguage.CHINESE_AUDIO_LANGUAGE -> getLocalizedDisplayName("zh")
       AudioLanguage.BRAZILIAN_PORTUGUESE_LANGUAGE -> getLocalizedDisplayName("pt", "BR")
+      AudioLanguage.ARABIC_LANGUAGE -> getLocalizedDisplayName("ar", "EG")
+      AudioLanguage.NIGERIAN_PIDGIN_LANGUAGE ->
+        resources.getString(R.string.nigerian_pidgin_localized_language_name)
       AudioLanguage.NO_AUDIO, AudioLanguage.AUDIO_LANGUAGE_UNSPECIFIED, AudioLanguage.UNRECOGNIZED,
       AudioLanguage.ENGLISH_AUDIO_LANGUAGE -> getLocalizedDisplayName("en")
     }
@@ -180,6 +183,8 @@ class AppLanguageResourceHandler @Inject constructor(
       OppiaLanguage.ENGLISH -> resources.getString(R.string.english_localized_language_name)
       OppiaLanguage.ARABIC -> resources.getString(R.string.arabic_localized_language_name)
       OppiaLanguage.HINGLISH -> resources.getString(R.string.hinglish_localized_language_name)
+      OppiaLanguage.NIGERIAN_PIDGIN ->
+        resources.getString(R.string.nigerian_pidgin_localized_language_name)
     }
   }
 

app/src/main/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtil.kt

@@ -28,6 +28,7 @@ import org.oppia.android.app.model.OppiaLanguage.ENGLISH
 import org.oppia.android.app.model.OppiaLanguage.HINDI
 import org.oppia.android.app.model.OppiaLanguage.HINGLISH
 import org.oppia.android.app.model.OppiaLanguage.LANGUAGE_UNSPECIFIED
+import org.oppia.android.app.model.OppiaLanguage.NIGERIAN_PIDGIN
 import org.oppia.android.app.model.OppiaLanguage.PORTUGUESE
 import org.oppia.android.app.model.OppiaLanguage.SWAHILI
 import org.oppia.android.app.model.OppiaLanguage.UNRECOGNIZED
@@ -72,8 +73,8 @@ class MathExpressionAccessibilityUtil @Inject constructor(
   ): String? {
     return when (language) {
       ENGLISH -> expression.toHumanReadableEnglishString(divAsFraction)
-      ARABIC, HINDI, HINGLISH, PORTUGUESE, BRAZILIAN_PORTUGUESE, SWAHILI, LANGUAGE_UNSPECIFIED,
-      UNRECOGNIZED -> null
+      ARABIC, HINDI, HINGLISH, PORTUGUESE, BRAZILIAN_PORTUGUESE, SWAHILI, NIGERIAN_PIDGIN,
+      LANGUAGE_UNSPECIFIED, UNRECOGNIZED -> null
     }
   }
 
@@ -91,8 +92,8 @@ class MathExpressionAccessibilityUtil @Inject constructor(
   ): String? {
     return when (language) {
       ENGLISH -> equation.toHumanReadableEnglishString(divAsFraction)
-      ARABIC, HINDI, HINGLISH, PORTUGUESE, BRAZILIAN_PORTUGUESE, SWAHILI, LANGUAGE_UNSPECIFIED,
-      UNRECOGNIZED -> null
+      ARABIC, HINDI, HINGLISH, PORTUGUESE, BRAZILIAN_PORTUGUESE, SWAHILI, NIGERIAN_PIDGIN,
+      LANGUAGE_UNSPECIFIED, UNRECOGNIZED -> null
     }
   }