Release Teacher 2.4.0 (88)

Author: kristofnemere

apps/teacher/build.gradle

@@ -55,8 +55,8 @@ android {
     defaultConfig {
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 86
-        versionName = '2.3.1'
+        versionCode = 88
+        versionName = '2.4.0'
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'com.instructure.teacher.espresso.TeacherHiltTestRunner'
         testInstrumentationRunnerArguments disableAnalytics: 'true'

apps/teacher/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
+  - notAnnotation com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.FlakyE2E, com.instructure.canvas.espresso.annotations.KnownBug, com.instructure.canvas.espresso.annotations.ReleaseExclude
   device:
   - model: Pixel2.arm
     version: 29
@@ -23,4 +23,3 @@ gcloud:
 flank:
   testShards: 10
   testRuns: 1
-

apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/AssignmentE2ETest.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.refresh
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.SectionsApi
@@ -61,6 +62,7 @@ class AssignmentE2ETest : TeacherComposeTest() {
         android.Manifest.permission.CAMERA
     )
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.E2E)
@@ -503,6 +505,7 @@ class AssignmentE2ETest : TeacherComposeTest() {
         speedGraderPage.assertCommentDisplayed(commentUploadInfo.fileName, student.name)
     }
 
+    @ReleaseExclude
     @E2E
     @Test
     @TestMetaData(Priority.COMMON, FeatureCategory.ASSIGNMENTS, TestCategory.E2E, SecondaryFeatureCategory.SECTIONS)

apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/SpeedGraderE2ETest.kt

@@ -24,6 +24,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.canvas.espresso.refresh
 import com.instructure.dataseeding.api.SubmissionsApi
@@ -51,6 +52,7 @@ class SpeedGraderE2ETest : TeacherComposeTest() {
 
     override fun enableAndConfigureAccessibilityChecks() = Unit
 
+    @ReleaseExclude
     @OptIn(ExperimentalTestApi::class)
     @E2E
     @Test

apps/teacher/src/main/java/com/instructure/teacher/router/RouteMatcher.kt

@@ -31,6 +31,7 @@ import com.instructure.canvasapi2.managers.FileFolderManager
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.FileFolder
+import com.instructure.canvasapi2.models.Group
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.canvasapi2.utils.ApiType
 import com.instructure.canvasapi2.utils.LinkHeaders
@@ -329,6 +330,7 @@ object RouteMatcher : BaseRouteMatcher() {
 
     fun route(activity: FragmentActivity, route: Route?) {
         val uri = route?.uri
+        Logger.i("RouteMatcher:route() - uri: $uri, routeContext: ${route?.routeContext}, primaryClass: ${route?.primaryClass}")
         if (route == null || route.routeContext === RouteContext.DO_NOT_ROUTE) {
             if (route?.uri != null) {
                 //No route, no problem
@@ -364,6 +366,8 @@ object RouteMatcher : BaseRouteMatcher() {
                 ?.contains("media_attachments") == true
         ) {
             handleStudioImmersiveViewRoute(route, activity)
+        } else if (route.routeContext === RouteContext.LTI) {
+            handleLtiRoute(activity, route)
         } else if (activity.resources.getBoolean(R.bool.isDeviceTablet)) {
             handleTabletRoute(activity, route)
         } else {
@@ -477,6 +481,36 @@ object RouteMatcher : BaseRouteMatcher() {
         }
     }
 
+    private fun handleLtiRoute(activity: FragmentActivity, route: Route) {
+        Logger.i("RouteMatcher:handleLtiRoute()")
+        val url = route.uri?.toString()
+        if (url.isNullOrEmpty()) {
+            return
+        }
+
+        // Don't intercept sessionless_launch URLs - they're already being handled by an existing LtiLaunchFragment
+        if (url.contains("sessionless_launch")) {
+            Logger.i("RouteMatcher:handleLtiRoute() - Skipping sessionless_launch URL")
+            return
+        }
+
+        val contextId = route.paramsHash[RouterParams.COURSE_ID]?.toLongOrNull()
+            ?: route.paramsHash[RouterParams.GROUP_ID]?.toLongOrNull()
+
+        val canvasContext: CanvasContext? = when (route.getContextType()) {
+            CanvasContext.Type.COURSE -> contextId?.let { Course(id = it) }
+            CanvasContext.Type.GROUP -> contextId?.let { Group(id = it) }
+            else -> null
+        }
+
+        if (canvasContext != null) {
+            val ltiRoute = LtiLaunchFragment.makeRoute(canvasContext, url, sessionLessLaunch = true)
+            route(activity, ltiRoute)
+        } else {
+            handleWebViewUrl(activity, url)
+        }
+    }
+
     private fun handleWebViewRoute(context: Context, route: Route) {
         context.startActivity(InternalWebViewActivity.createIntent(context, route, "", false))
     }

libs/interactions/src/main/java/com/instructure/interactions/router/RouterParams.kt

@@ -5,6 +5,7 @@ object RouterParams {
     const val EVENT_ID = "event_id"
     const val CONVERSATION_ID = "conversation_id"
     const val COURSE_ID = "course_id"
+    const val GROUP_ID = "group_id"
     const val FILE_ID = "file_id"
     const val FOLDER_NAME = "file_name"
     const val GRADE_ID = "grade_id"

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

@@ -177,7 +177,9 @@ class LtiLaunchFragment : BaseCanvasFragment(), NavigationCallbacks {
             }
 
             private fun canRouteInternally(url: String) =
-                webViewRouter.canRouteInternally(url) && ltiUrl?.substringBefore("?") != url.substringBefore("?")
+                webViewRouter.canRouteInternally(url)
+                    && ltiUrl?.substringBefore("?") != url.substringBefore("?")
+                    && !url.contains("sessionless_launch")
 
             override fun routeInternallyCallback(url: String) {
                 // Handle return button in external tools. Links to course homepage should close the tool.