Fix #5137: Upgrade builds to target SDK 33

.github/actions/set-up-android-bazel-build-environment/action.yml

@@ -72,9 +72,9 @@ runs:
         $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platform-tools"
       shell: bash
 
-    - name: Install SDK 31
+    - name: Install SDK 33
       run: |
-        $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platforms;android-31"
+        $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platforms;android-33"
       shell: bash
 
     - name: Install build tools 29.0.2

BUILD.bazel

@@ -118,14 +118,14 @@ package_group(
             "flavor": "oppia",
             "min_sdk_version": 21,
             "multidex": "native",
-            "target_sdk_version": 31,
+            "target_sdk_version": 33,
         },
         {
             "flavor": "oppia_kitkat",
             "main_dex_list": "//:config/kitkat_main_dex_class_list.txt",
             "min_sdk_version": 19,
             "multidex": "manual_main_dex",
-            "target_sdk_version": 31,
+            "target_sdk_version": 33,
         },
     ]
 ]

WORKSPACE

@@ -11,7 +11,7 @@ load("//third_party:versions.bzl", "HTTP_DEPENDENCY_VERSIONS", "get_maven_depend
 # TODO(#1542): Sync Android SDK version with the manifest.
 android_sdk_repository(
     name = "androidsdk",
-    api_level = 31,
+    api_level = 33,
     build_tools_version = "29.0.2",
 )
 

app/build.gradle

@@ -6,12 +6,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 31
+  compileSdkVersion 33
   buildToolsVersion "29.0.2"
   defaultConfig {
     applicationId "org.oppia.android"
     minSdkVersion 19
-    targetSdkVersion 31
+    targetSdkVersion 33
     versionCode 1
     versionName "1.0"
     multiDexEnabled true

app/src/main/AppAndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.ui">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="31" />
+    android:targetSdkVersion="33" />
 </manifest>

app/src/main/DatabindingAdaptersManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.databinding.adapters">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="31" />
+    android:targetSdkVersion="33" />
 </manifest>

app/src/main/DatabindingResourcesManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.databinding">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="31" />
+    android:targetSdkVersion="33" />
 </manifest>

app/src/main/RecyclerviewAdaptersManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.recyclerview.adapters">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="31" />
+    android:targetSdkVersion="33" />
 </manifest>

app/src/main/ViewModelManifest.xml

@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.vm">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="31" />
+    android:targetSdkVersion="33" />
 </manifest>

app/src/main/ViewModelsManifest.xml

@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.view.models">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="31" />
+    android:targetSdkVersion="33" />
 </manifest>

app/src/main/ViewsManifest.xml

@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.views">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="31" />
+    android:targetSdkVersion="33" />
 </manifest>

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

@@ -286,25 +286,25 @@ class ExplorationActivityPresenter @Inject constructor(
 
   fun stopExploration(isCompletion: Boolean) {
     fontScaleConfigurationUtil.adjustFontScale(activity, ReadingTextSize.MEDIUM_TEXT_SIZE)
-    explorationDataController.stopPlayingExploration(isCompletion).toLiveData()
-      .observe(
-        activity,
-        {
-          when (it) {
-            is AsyncResult.Pending -> oppiaLogger.d("ExplorationActivity", "Stopping exploration")
-            is AsyncResult.Failure ->
-              oppiaLogger.e("ExplorationActivity", "Failed to stop exploration", it.error)
-            is AsyncResult.Success -> {
-              oppiaLogger.d("ExplorationActivity", "Successfully stopped exploration")
-              if (isCompletion) {
-                maybeShowSurveyDialog(profileId, topicId)
-              } else {
-                backPressActivitySelector()
-              }
-            }
+    explorationDataController.stopPlayingExploration(isCompletion).toLiveData().observe(activity) {
+      when (it) {
+        is AsyncResult.Pending ->
+          oppiaLogger.d("ExplorationActivity", "Stopping exploration")
+        is AsyncResult.Failure -> {
+          oppiaLogger.e("ExplorationActivity", "Failed to stop exploration", it.error)
+          // Allow the user to always exit if they get into a broken state.
+          backPressActivitySelector()
+        }
+        is AsyncResult.Success -> {
+          oppiaLogger.d("ExplorationActivity", "Successfully stopped exploration")
+          if (isCompletion) {
+            maybeShowSurveyDialog(profileId, topicId)
+          } else {
+            backPressActivitySelector()
           }
         }
-      )
+      }
+    }
   }
 
   fun onKeyboardAction(actionCode: Int) {

app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt

@@ -1897,6 +1897,38 @@ class ExplorationActivityTest {
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
 
+  @Test
+  fun testExpActivity_pressBack_whenProgressControllerBroken_stillEndsActivity() {
+    setUpAudioForFractionLesson()
+    explorationActivityTestRule.launchActivity(
+      createExplorationActivityIntent(
+        internalProfileId,
+        FRACTIONS_TOPIC_ID,
+        FRACTIONS_STORY_ID_0,
+        FRACTIONS_EXPLORATION_ID_0,
+        shouldSavePartialProgress = true
+      )
+    )
+    explorationDataController.startPlayingNewExploration(
+      internalProfileId,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0,
+      FRACTIONS_EXPLORATION_ID_0
+    )
+    testCoroutineDispatchers.runCurrent()
+
+    // Simulate cases when the data controller enters a bad state by pre-finishing the exploration
+    // prior to trying to exit. While this seems impossible, it's been observed in real situations
+    // without a known cause. If it does happen, the user needs to have an escape hatch to actually
+    // leave. See #5233.
+    explorationDataController.stopPlayingExploration(isCompletion = false)
+    testCoroutineDispatchers.runCurrent()
+    pressBack()
+    testCoroutineDispatchers.runCurrent()
+
+    assertThat(explorationActivityTestRule.activity.isFinishing).isTrue()
+  }
+
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testExpActivity_englishContentLang_contentIsInEnglish() {
@@ -2303,13 +2335,15 @@ class ExplorationActivityTest {
     explorationId: String,
     shouldSavePartialProgress: Boolean
   ): Intent {
+    // Note that the parent screen is defaulted to TOPIC_SCREEN_LESSONS_TAB since that's the most
+    // typical route to playing an exploration.
     return ExplorationActivity.createExplorationActivityIntent(
       ApplicationProvider.getApplicationContext(),
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build(),
       topicId,
       storyId,
       explorationId,
-      parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED,
+      parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB,
       shouldSavePartialProgress
     )
   }

app/src/test/resources/robolectric.properties

@@ -1,3 +1,3 @@
 # app/src/test/resources/robolectric.properties
-# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 31
+# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 33
 sdk=30

build_flavors.bzl

@@ -46,7 +46,7 @@ _FLAVOR_METADATA = {
     "dev": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 31,
+        "target_sdk_version": 33,
         "multidex": "native",
         "proguard_specs": [],  # Developer builds are not optimized.
         "production_release": False,
@@ -60,7 +60,7 @@ _FLAVOR_METADATA = {
     "dev_kitkat": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 19,
-        "target_sdk_version": 31,
+        "target_sdk_version": 33,
         "multidex": "manual_main_dex",
         "main_dex_list": _MAIN_DEX_LIST_TARGET_KITKAT,
         "proguard_specs": [],  # Developer builds are not optimized.
@@ -75,7 +75,7 @@ _FLAVOR_METADATA = {
     "alpha": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 31,
+        "target_sdk_version": 33,
         "multidex": "native",
         "proguard_specs": _PRODUCTION_PROGUARD_SPECS,
         "production_release": True,
@@ -89,7 +89,7 @@ _FLAVOR_METADATA = {
     "alpha_kitkat": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 19,
-        "target_sdk_version": 31,
+        "target_sdk_version": 33,
         "multidex": "manual_main_dex",
         "main_dex_list": _MAIN_DEX_LIST_TARGET_KITKAT,
         "proguard_specs": [],
@@ -104,7 +104,7 @@ _FLAVOR_METADATA = {
     "alpha_kenya": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 31,
+        "target_sdk_version": 33,
         "multidex": "native",
         "proguard_specs": _PRODUCTION_PROGUARD_SPECS,
         "production_release": True,
@@ -118,7 +118,7 @@ _FLAVOR_METADATA = {
     "beta": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 31,
+        "target_sdk_version": 33,
         "multidex": "native",
         "proguard_specs": _PRODUCTION_PROGUARD_SPECS,
         "production_release": True,
@@ -132,7 +132,7 @@ _FLAVOR_METADATA = {
     "ga": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 31,
+        "target_sdk_version": 33,
         "multidex": "native",
         "proguard_specs": _PRODUCTION_PROGUARD_SPECS,
         "production_release": True,

config/src/java/org/oppia/android/config/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.config">
 
-  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
+  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
 </manifest>

data/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 31
+  compileSdkVersion 33
   buildToolsVersion "29.0.2"
 
   defaultConfig {
     minSdkVersion 19
-    targetSdkVersion 31
+    targetSdkVersion 33
     versionCode 1
     versionName "1.0"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

data/src/test/resources/robolectric.properties

@@ -1,3 +1,3 @@
 # data/src/test/resources/robolectric.properties
-# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 31
+# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 33
 sdk=30

domain/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 31
+  compileSdkVersion 33
   buildToolsVersion "29.0.2"
 
   defaultConfig {
     minSdkVersion 19
-    targetSdkVersion 31
+    targetSdkVersion 33
     versionCode 1
     versionName "1.0"
     javaCompileOptions {

domain/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.domain">
-  <uses-sdk android:targetSdkVersion="31" />
+  <uses-sdk android:targetSdkVersion="33" />
 </manifest>

domain/src/test/resources/robolectric.properties

@@ -1,3 +1,3 @@
 # domain/src/test/resources/robolectric.properties
-# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 31
+# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 33
 sdk=30

instrumentation/BUILD.bazel

@@ -18,7 +18,7 @@ android_binary(
     manifest_values = {
         "applicationId": "org.oppia.android",
         "minSdkVersion": "19",
-        "targetSdkVersion": "31",
+        "targetSdkVersion": "33",
         "versionCode": "0",
         "versionName": "0.1-test",
     },

testing/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 31
+  compileSdkVersion 33
   buildToolsVersion "29.0.2"
 
   defaultConfig {
     minSdkVersion 19
-    targetSdkVersion 31
+    targetSdkVersion 33
     versionCode 1
     versionName "1.0"
   }

testing/src/test/resources/robolectric.properties

@@ -1,3 +1,3 @@
 # testing/src/test/resources/robolectric.properties
-# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 31
+# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 33
 sdk=30

utility/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 31
+  compileSdkVersion 33
   buildToolsVersion "29.0.2"
 
   defaultConfig {
     minSdkVersion 19
-    targetSdkVersion 31
+    targetSdkVersion 33
     versionCode 1
     versionName "1.0"
     javaCompileOptions {

utility/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.util">
-  <uses-sdk android:targetSdkVersion="31" />
+  <uses-sdk android:targetSdkVersion="33" />
 </manifest>

utility/src/test/resources/robolectric.properties

@@ -1,3 +1,3 @@
 # utility/src/test/resources/robolectric.properties
-# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 31
+# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 33
 sdk=30