Release Student 8.5.0 (287)

apps/student/build.gradle

@@ -38,8 +38,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 285
-        versionName = '8.4.2'
+        versionCode = 287
+        versionName = '8.5.0'
 
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'com.instructure.student.espresso.StudentHiltTestRunner'

apps/student/flank_e2e.yml

@@ -13,7 +13,7 @@ gcloud:
   timeout: 60m
   test-targets:
   - annotation com.instructure.canvas.espresso.annotations.E2E
-  - notAnnotation com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.FlakyE2E, com.instructure.canvas.espresso.annotations.KnownBug, com.instructure.canvas.espresso.annotations.OfflineE2E
+  - notAnnotation com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.FlakyE2E, com.instructure.canvas.espresso.annotations.KnownBug, com.instructure.canvas.espresso.annotations.OfflineE2E, com.instructure.canvas.espresso.annotations.ReleaseExclude
   device:
   - model: Pixel2.arm
     version: 29
@@ -23,4 +23,3 @@ gcloud:
 flank:
   testShards: 10
   testRuns: 1
-

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DashboardE2ETest.kt

@@ -23,6 +23,7 @@ import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.ReleaseExclude
 import com.instructure.dataseeding.api.ConversationsApi
 import com.instructure.dataseeding.api.GroupsApi
 import com.instructure.student.ui.utils.StudentTest
@@ -37,6 +38,7 @@ class DashboardE2ETest : StudentTest() {
 
     override fun enableAndConfigureAccessibilityChecks() = Unit
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.DASHBOARD, TestCategory.E2E)

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DiscussionsE2ETest.kt

@@ -25,6 +25,7 @@ import com.instructure.canvas.espresso.SecondaryFeatureCategory
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.ReleaseExclude
 import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.dataseeding.api.DiscussionTopicsApi
 import com.instructure.dataseeding.api.EnrollmentsApi
@@ -244,6 +245,7 @@ class DiscussionsE2ETest: StudentComposeTest() {
         assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due","No Due Date")
     }
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.DISCUSSION_CHECKPOINTS)

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/TodoE2ETest.kt

@@ -8,6 +8,7 @@ import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.ReleaseExclude
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.utils.toApiString
 import com.instructure.dataseeding.api.AssignmentsApi
@@ -37,6 +38,7 @@ class TodoE2ETest : StudentComposeTest() {
 
     override fun enableAndConfigureAccessibilityChecks() = Unit
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.TODOS, TestCategory.E2E)
@@ -348,6 +350,7 @@ class TodoE2ETest : StudentComposeTest() {
         canvasWebViewPage.runTextChecks(WebViewTextCheck(locatorType = Locator.ID, locatorValue = "quiz_title", textValue = nextWeekQuiz.title))
     }
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.TODOS, TestCategory.E2E)

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/k5/GradesElementaryE2ETest.kt

@@ -24,6 +24,7 @@ import com.instructure.canvas.espresso.SecondaryFeatureCategory
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.ReleaseExclude
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.GradingPeriodsApi
 import com.instructure.dataseeding.api.SubmissionsApi
@@ -48,6 +49,7 @@ class GradesElementaryE2ETest : StudentTest() {
 
     override fun enableAndConfigureAccessibilityChecks() = Unit
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.E2E, SecondaryFeatureCategory.K5_GRADES)

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/AssignmentsE2ETest.kt

@@ -28,6 +28,7 @@ import com.instructure.canvas.espresso.SecondaryFeatureCategory
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.ReleaseExclude
 import com.instructure.canvas.espresso.annotations.Stub
 import com.instructure.canvas.espresso.checkToastText
 import com.instructure.canvas.espresso.common.pages.compose.AssignmentListPage
@@ -1076,6 +1077,7 @@ class AssignmentsE2ETest: StudentComposeTest() {
         assignmentDetailsPage.assertAssignmentSubmitted()
     }
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.E2E)

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/BookmarksE2ETest.kt

@@ -25,6 +25,7 @@ import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.ReleaseExclude
 import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.CoursesApi
@@ -228,6 +229,7 @@ class BookmarksE2ETest : StudentComposeTest() {
         assert(homeScreenShortcut.exists()) { "Expected to be on system home screen with bookmark shortcut visible, but it was not found." }
     }
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.BUG_CASE, FeatureCategory.BOOKMARKS, TestCategory.E2E)

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CourseBrowserE2ETest.kt

@@ -30,6 +30,7 @@ import com.instructure.canvas.espresso.SecondaryFeatureCategory
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.ReleaseExclude
 import com.instructure.canvasapi2.models.SmartSearchContentType
 import com.instructure.canvasapi2.models.SmartSearchFilter
 import com.instructure.dataseeding.api.AssignmentsApi
@@ -56,6 +57,7 @@ class CourseBrowserE2ETest : StudentComposeTest() {
 
     override fun enableAndConfigureAccessibilityChecks() = Unit
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.COURSE_BROWSER, TestCategory.E2E, SecondaryFeatureCategory.SMART_SEARCH)

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/InboxE2ETest.kt

@@ -51,10 +51,10 @@ class InboxE2ETest: StudentComposeTest() {
 
     override fun enableAndConfigureAccessibilityChecks() = Unit
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.INBOX, TestCategory.E2E)
-    @ReleaseExclude
     fun testInboxSelectedButtonActionsE2E() {
 
         Log.d(PREPARATION_TAG, "Seeding data.")

libs/pandautils/src/main/java/com/instructure/pandautils/features/lti/LtiLaunchFragment.kt

@@ -18,8 +18,6 @@ package com.instructure.pandautils.features.lti
 
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -88,6 +86,8 @@ class LtiLaunchFragment : BaseCanvasFragment(), NavigationCallbacks {
     private var ltiUrl: String? by NullableStringArg(key = LTI_URL)
     private var canvasContext: CanvasContext by ParcelableArg(default = CanvasContext.emptyUserContext(), key = Const.CANVAS_CONTEXT)
 
+    private var customTabLaunched = false
+
     @Inject
     lateinit var ltiLaunchFragmentBehavior: LtiLaunchFragmentBehavior
 
@@ -123,12 +123,22 @@ class LtiLaunchFragment : BaseCanvasFragment(), NavigationCallbacks {
         }
 
         savedInstanceState?.let {
+            customTabLaunched = it.getBoolean(KEY_CUSTOM_TAB_LAUNCHED, false)
             binding.webView.restoreState(it)
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (customTabLaunched) {
+            customTabLaunched = false
+            ltiLaunchFragmentBehavior.closeLtiLaunchFragment(requireActivity())
+        }
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
+        outState.putBoolean(KEY_CUSTOM_TAB_LAUNCHED, customTabLaunched)
         binding.webView.saveState(outState)
     }
 
@@ -148,10 +158,8 @@ class LtiLaunchFragment : BaseCanvasFragment(), NavigationCallbacks {
 
     private fun launchCustomTab(url: String) {
         activity?.let {
+            customTabLaunched = true
             it.launchCustomTab(url, ltiLaunchFragmentBehavior.toolbarColor)
-            Handler(Looper.getMainLooper()).postDelayed({
-                it.onBackPressed()
-            }, 500)
         }
     }
 
@@ -236,6 +244,8 @@ class LtiLaunchFragment : BaseCanvasFragment(), NavigationCallbacks {
     }
 
     companion object {
+        private const val KEY_CUSTOM_TAB_LAUNCHED = "key_custom_tab_launched"
+
         const val LTI_URL = "lti_url"
         const val LTI_TITLE = "lti_title"
         const val LTI_TAB = "lti_tab"