Release Student 8.4.1 (284)

.github/workflows/pr-pipeline.yml

@@ -4,7 +4,9 @@ on:
   pull_request:
     types: [opened, synchronize, labeled]
     branches-ignore:
-      - 'release/**'
+      - 'release/student'
+      - 'release/teacher'
+      - 'release/parent'
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}

apps/student/build.gradle

@@ -38,8 +38,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 283
-        versionName = '8.4.0'
+        versionCode = 284
+        versionName = '8.4.1'
 
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'com.instructure.student.espresso.StudentHiltTestRunner'

apps/student/src/main/java/com/instructure/student/activity/BaseRouterActivity.kt

@@ -39,7 +39,6 @@ import com.instructure.pandautils.models.PushNotification
 import com.instructure.pandautils.receivers.PushExternalReceiver
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.LoaderUtils
-import com.instructure.pandautils.utils.RouteUtils
 import com.instructure.pandautils.utils.toast
 import com.instructure.student.R
 import com.instructure.student.fragment.InternalWebviewFragment
@@ -317,8 +316,7 @@ abstract class BaseRouterActivity : CallbackActivity(), FullScreenInteractions {
     }
 
     private suspend fun shouldOpenInternally(url: String): Boolean {
-        val mediaUrl = RouteUtils.getMediaUri(Uri.parse(url)).toString()
-        return (mediaUrl.endsWith(".mpd") || mediaUrl.endsWith(".m3u8") || mediaUrl.endsWith(".mp4"))
+        return (url.endsWith(".mpd") || url.endsWith(".m3u8") || url.endsWith(".mp4"))
     }
 
     override fun onDestroy() {

apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt

@@ -22,7 +22,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import androidx.annotation.OptIn
-import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
@@ -49,12 +48,10 @@ import com.instructure.pandautils.analytics.SCREEN_VIEW_VIDEO_VIEW
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.base.BaseCanvasActivity
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.RouteUtils
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.student.databinding.ActivityVideoViewBinding
 import com.instructure.student.util.Const
-import kotlinx.coroutines.launch
 
 @OptIn(UnstableApi::class)
 @ScreenView(SCREEN_VIEW_VIDEO_VIEW)
@@ -85,17 +82,14 @@ class VideoViewActivity : BaseCanvasActivity() {
     }
 
     private fun fetchMediaUri(uri: Uri) {
-        lifecycleScope.launch {
-            val mediaUri = RouteUtils.getMediaUri(uri)
-            player = ExoPlayer.Builder(this@VideoViewActivity)
-                .setTrackSelector(trackSelector)
-                .setLoadControl(DefaultLoadControl())
-                .build()
-            binding.playerView.player = player
-            player?.playWhenReady = true
-            player?.setMediaSource(buildMediaSource(mediaUri))
-            player?.prepare()
-        }
+        player = ExoPlayer.Builder(this@VideoViewActivity)
+            .setTrackSelector(trackSelector)
+            .setLoadControl(DefaultLoadControl())
+            .build()
+        binding.playerView.player = player
+        player?.playWhenReady = true
+        player?.setMediaSource(buildMediaSource(uri))
+        player?.prepare()
     }
 
     private fun buildMediaSource(uri: Uri): MediaSource {

apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt

@@ -22,7 +22,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.OptIn
-import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.HttpDataSource
 import androidx.media3.exoplayer.source.UnrecognizedInputFormatException
@@ -38,7 +37,6 @@ import com.instructure.pandautils.utils.ExoAgentState
 import com.instructure.pandautils.utils.ExoInfoListener
 import com.instructure.pandautils.utils.NullableStringArg
 import com.instructure.pandautils.utils.ParcelableArg
-import com.instructure.pandautils.utils.RouteUtils
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.onClick
@@ -49,7 +47,6 @@ import com.instructure.student.R
 import com.instructure.student.databinding.FragmentMediaSubmissionViewBinding
 import com.instructure.student.mobius.assignmentDetails.submissionDetails.SubmissionDetailsContentType
 import com.instructure.student.router.RouteMatcher
-import kotlinx.coroutines.launch
 
 @OptIn(UnstableApi::class)
 class MediaSubmissionViewFragment : BaseCanvasFragment() {
@@ -115,11 +112,9 @@ class MediaSubmissionViewFragment : BaseCanvasFragment() {
     }
 
     private fun fetchMediaUri() {
-        lifecycleScope.launch {
-            mediaUri = RouteUtils.getMediaUri(uri)
-            if (isResumed) {
-                attachMediaPlayer()
-            }
+        mediaUri = uri
+        if (isResumed) {
+            attachMediaPlayer()
         }
     }
 

apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewMediaFragment.kt

@@ -24,7 +24,6 @@ import android.view.ViewGroup
 import android.widget.ImageButton
 import androidx.annotation.OptIn
 import androidx.appcompat.widget.Toolbar
-import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.HttpDataSource
 import androidx.media3.exoplayer.source.UnrecognizedInputFormatException
@@ -51,7 +50,6 @@ import com.instructure.pandautils.utils.IntArg
 import com.instructure.pandautils.utils.NullableParcelableArg
 import com.instructure.pandautils.utils.NullableStringArg
 import com.instructure.pandautils.utils.ParcelableArg
-import com.instructure.pandautils.utils.RouteUtils
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.Utils
 import com.instructure.pandautils.utils.ViewStyler
@@ -65,7 +63,6 @@ import com.instructure.teacher.router.RouteMatcher
 import com.instructure.teacher.utils.setupBackButtonWithExpandCollapseAndBack
 import com.instructure.teacher.utils.setupMenu
 import com.instructure.teacher.utils.updateToolbarExpandCollapseIcon
-import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 
 @ScreenView(SCREEN_VIEW_VIEW_MEDIA)
@@ -143,11 +140,9 @@ class ViewMediaFragment : BaseCanvasFragment(), ShareableFile {
     }
 
     private fun fetchMediaUri() {
-        lifecycleScope.launch {
-            mediaUri = RouteUtils.getMediaUri(uri)
-            if (isResumed) {
-                attachMediaPlayer()
-            }
+        mediaUri = uri
+        if (isResumed) {
+            attachMediaPlayer()
         }
     }
 

libs/pandautils/src/main/java/com/instructure/pandautils/activities/BaseViewMediaActivity.kt

@@ -29,7 +29,6 @@ import android.widget.LinearLayout
 import androidx.annotation.OptIn
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.HttpDataSource
 import androidx.media3.exoplayer.source.UnrecognizedInputFormatException
@@ -46,7 +45,6 @@ import com.instructure.pandautils.utils.ExoAgentState
 import com.instructure.pandautils.utils.ExoInfoListener
 import com.instructure.pandautils.utils.FileFolderDeletedEvent
 import com.instructure.pandautils.utils.FileFolderUpdatedEvent
-import com.instructure.pandautils.utils.RouteUtils
 import com.instructure.pandautils.utils.Utils
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.onClick
@@ -55,7 +53,6 @@ import com.instructure.pandautils.utils.setMenu
 import com.instructure.pandautils.utils.setVisible
 import com.instructure.pandautils.utils.setupAsCloseButton
 import com.instructure.pandautils.utils.viewExternally
-import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import java.io.File
 
@@ -92,10 +89,8 @@ abstract class BaseViewMediaActivity : BaseCanvasActivity() {
             mediaProgressBar.announceForAccessibility(getString(R.string.loading))
             mediaProgressBar.setVisible()
         }
-        lifecycleScope.launch {
-            mediaUri = RouteUtils.getMediaUri(mUri)
-            attachMediaPlayer()
-        }
+        mediaUri = mUri
+        attachMediaPlayer()
     }
 
     private fun attachMediaPlayer() = with(binding) {