[MBL-19871][All] Fix media attachments not appearing in Inbox

kristofnemere · web-flow · commit a997e5c58d9b · 2026-03-31T12:23:55.000+02:00
refs: MBL-19871
affects: Student, Teacher, Parent
release note: Fixed an issue where media attachments sent via Inbox were not visible or playable on Android devices.
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt
@@ -22,6 +22,7 @@ import androidx.fragment.app.FragmentActivity
 import com.instructure.canvasapi2.apis.InboxApi
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.Conversation
+import com.instructure.canvasapi2.models.MediaComment
 import com.instructure.pandautils.features.inbox.list.InboxRouter
 import com.instructure.pandautils.features.inbox.utils.InboxComposeOptions
 import com.instructure.pandautils.utils.FileDownloader
@@ -63,6 +64,10 @@ class ParentInboxRouter(
         fileDownloader.downloadFileToDevice(attachment)
     }
 
+    override fun routeToMediaAttachment(mediaComment: MediaComment) {
+        fileDownloader.downloadFileToDevice(mediaComment.url, mediaComment.displayName, mediaComment.contentType)
+    }
+
     override fun popDetailsScreen(activity: FragmentActivity?) {
         activity?.onBackPressed()
     }
diff --git a/apps/student/src/main/java/com/instructure/student/features/inbox/list/StudentInboxRouter.kt b/apps/student/src/main/java/com/instructure/student/features/inbox/list/StudentInboxRouter.kt
@@ -22,6 +22,7 @@ import androidx.fragment.app.FragmentActivity
 import com.instructure.canvasapi2.apis.InboxApi
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.Conversation
+import com.instructure.canvasapi2.models.MediaComment
 import com.instructure.pandautils.features.inbox.compose.InboxComposeFragment
 import com.instructure.pandautils.features.inbox.details.InboxDetailsFragment
 import com.instructure.pandautils.features.inbox.list.InboxFragment
@@ -62,6 +63,10 @@ class StudentInboxRouter(private val activity: FragmentActivity, private val fra
         openMedia(activity, attachment.url)
     }
 
+    override fun routeToMediaAttachment(mediaComment: MediaComment) {
+        openMedia(activity, mediaComment.url)
+    }
+
     override fun popDetailsScreen(activity: FragmentActivity?) {
         activity?.onBackPressed()
     }
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/inbox/list/TeacherInboxRouter.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/inbox/list/TeacherInboxRouter.kt
@@ -24,6 +24,7 @@ import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Conversation
 import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.MediaComment
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.interactions.router.Route
 import com.instructure.pandautils.features.inbox.compose.InboxComposeFragment
@@ -86,6 +87,10 @@ class TeacherInboxRouter(private val activity: FragmentActivity, private val fra
         openMedia(activity, attachment.url)
     }
 
+    override fun routeToMediaAttachment(mediaComment: MediaComment) {
+        openMedia(activity, mediaComment.url)
+    }
+
     override fun popDetailsScreen(activity: FragmentActivity?) {
         if (activity == null) return
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsFragment.kt
@@ -127,6 +127,9 @@ class InboxDetailsFragment : BaseCanvasFragment(), FragmentInteractions {
             is InboxDetailsFragmentAction.OpenAttachment -> {
                 inboxRouter.routeToAttachment(action.attachment)
             }
+            is InboxDetailsFragmentAction.OpenMediaAttachment -> {
+                inboxRouter.routeToMediaAttachment(action.mediaComment)
+            }
             is InboxDetailsFragmentAction.UpdateParentFragment -> {
                 sharedEvents.sendEvent(lifecycleScope, InboxSharedAction.RefreshListScreen)
             }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsUiState.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsUiState.kt
@@ -17,6 +17,7 @@ package com.instructure.pandautils.features.inbox.details
 
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.Conversation
+import com.instructure.canvasapi2.models.MediaComment
 import com.instructure.canvasapi2.models.Message
 import com.instructure.pandautils.features.inbox.utils.InboxComposeOptions
 import com.instructure.pandautils.features.inbox.utils.InboxMessageUiState
@@ -50,6 +51,7 @@ sealed class InboxDetailsFragmentAction {
     data class ShowScreenResult(val message: String) : InboxDetailsFragmentAction()
     data class UrlSelected(val url: String) : InboxDetailsFragmentAction()
     data class OpenAttachment(val attachment: Attachment) : InboxDetailsFragmentAction()
+    data class OpenMediaAttachment(val mediaComment: MediaComment) : InboxDetailsFragmentAction()
     data object UpdateParentFragment : InboxDetailsFragmentAction()
     data class NavigateToCompose(val options: InboxComposeOptions) : InboxDetailsFragmentAction()
 }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModel.kt
@@ -88,6 +88,11 @@ class InboxDetailsViewModel @Inject constructor(
                     _events.send(InboxDetailsFragmentAction.OpenAttachment(action.attachment))
                 }
             }
+            is MessageAction.OpenMediaAttachment -> {
+                viewModelScope.launch {
+                    _events.send(InboxDetailsFragmentAction.OpenMediaAttachment(action.mediaComment))
+                }
+            }
             is MessageAction.UrlSelected -> {
                 viewModelScope.launch {
                     _events.send(InboxDetailsFragmentAction.UrlSelected(action.url))
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/InboxRouter.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/InboxRouter.kt
@@ -21,6 +21,7 @@ import androidx.fragment.app.FragmentActivity
 import com.instructure.canvasapi2.apis.InboxApi
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.Conversation
+import com.instructure.canvasapi2.models.MediaComment
 import com.instructure.pandautils.features.inbox.utils.InboxComposeOptions
 
 interface InboxRouter {
@@ -37,5 +38,7 @@ interface InboxRouter {
 
     fun routeToAttachment(attachment: Attachment)
 
+    fun routeToMediaAttachment(mediaComment: MediaComment)
+
     fun popDetailsScreen(activity: FragmentActivity?)
 }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/utils/AttachmentCard.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/utils/AttachmentCard.kt
@@ -117,13 +117,15 @@ fun AttachmentCard(
                     overflow = TextOverflow.Ellipsis
                 )
 
-                Spacer(Modifier.height(8.dp))
+                if (attachmentCardItem.showFileSize) {
+                    Spacer(Modifier.height(8.dp))
 
-                Text(
-                    Formatter.formatFileSize(LocalContext.current, attachment.size),
-                    color = colorResource(id = R.color.textDark),
-                    fontSize = 14.sp,
-                )
+                    Text(
+                        Formatter.formatFileSize(LocalContext.current, attachment.size),
+                        color = colorResource(id = R.color.textDark),
+                        fontSize = 14.sp,
+                    )
+                }
             }
 
             Spacer(modifier = Modifier.width(8.dp))
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/utils/AttachmentCardItem.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/utils/AttachmentCardItem.kt
@@ -23,7 +23,8 @@ data class AttachmentCardItem (
     val status: AttachmentStatus, // TODO: Currently this is not used for proper state handling, but if the upload process will be refactored it can be useful
     val readOnly: Boolean,
     val uploadProgress: Float? = null, // Upload progress from 0.0 to 1.0, null if not uploading
-    val workerId: String? = null // WorkManager UUID to track which upload this belongs to
+    val workerId: String? = null, // WorkManager UUID to track which upload this belongs to
+    val showFileSize: Boolean = true
 )
 
 enum class AttachmentStatus {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/utils/InboxMessageUiState.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/utils/InboxMessageUiState.kt
@@ -17,6 +17,7 @@ package com.instructure.pandautils.features.inbox.utils
 
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.BasicUser
+import com.instructure.canvasapi2.models.MediaComment
 import com.instructure.canvasapi2.models.Message
 
 data class InboxMessageUiState(
@@ -35,5 +36,6 @@ sealed class MessageAction {
     data class Forward(val message: Message) : MessageAction()
     data class DeleteMessage(val message: Message) : MessageAction()
     data class OpenAttachment(val attachment: Attachment) : MessageAction()
+    data class OpenMediaAttachment(val mediaComment: MediaComment) : MessageAction()
     data class UrlSelected(val url: String) : MessageAction()
 }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/utils/InboxMessageView.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/utils/InboxMessageView.kt
@@ -58,6 +58,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.BasicUser
 import com.instructure.canvasapi2.models.Message
 import com.instructure.canvasapi2.utils.ContextKeeper
@@ -134,6 +135,22 @@ private fun InboxMessageDetailsView(
                 onRemove = {})
         }
 
+        messageState.message?.mediaComment?.let { mediaComment ->
+            Spacer(modifier = Modifier.height(16.dp))
+
+            val mediaAttachment = Attachment(
+                contentType = mediaComment.contentType,
+                filename = mediaComment.displayName ?: mediaComment._fileName,
+                url = mediaComment.url,
+            )
+            val attachmentCardItem = AttachmentCardItem(mediaAttachment, AttachmentStatus.UPLOADED, readOnly = true, showFileSize = false)
+            AttachmentCard(
+                attachmentCardItem,
+                onSelect = { actionHandler(MessageAction.OpenMediaAttachment(mediaComment)) },
+                onRemove = {}
+            )
+        }
+
         if (messageState.enabledActions  && !messageState.cannotReply) {
             Spacer(modifier = Modifier.height(16.dp))
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/loaders/OpenMediaAsyncTaskLoader.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/loaders/OpenMediaAsyncTaskLoader.kt
@@ -38,7 +38,6 @@ import com.instructure.pandautils.utils.FileUploadUtils
 import com.instructure.pandautils.utils.Utils.getAttachmentsDirectory
 import com.instructure.pandautils.utils.orDefault
 import okhttp3.Request
-import okio.Source
 import okio.buffer
 import okio.sink
 import java.io.File
@@ -253,13 +252,15 @@ class OpenMediaAsyncTaskLoader(context: Context, args: Bundle?) : AsyncTaskLoade
             file
         )
 
+        val resolvedType = contentResolver.getType(fileUri)
+
         // Sometimes the CanvasWebView download listener won't be able to resolve the
         // contentDisposition which causes the contentResolver to be unable to determine the
         // mime type since the file name will have no extension. In that case, we use the mime type.
-        if (contentResolver.getType(fileUri)!!.contains("octet-stream") && mimeType!!.contains("pdf")) {
+        if (resolvedType.orEmpty().contains("octet-stream") && !mimeType.isNullOrEmpty()) {
             intent.setDataAndType(fileUri, mimeType)
         } else {
-            intent.setDataAndType(fileUri, contentResolver.getType(fileUri))
+            intent.setDataAndType(fileUri, resolvedType)
         }
 
         // We know that we can always handle pdf intents with pspdfkit, so we don't want to error out here
@@ -289,7 +290,7 @@ class OpenMediaAsyncTaskLoader(context: Context, args: Bundle?) : AsyncTaskLoade
             }
 
             // Extract headers from response (headers are available before reading the body)
-            var responseMimeType = resp.header("Content-Type")
+            var responseMimeType = normalizeMimeType(resp.header("Content-Type"))
             var responseFilename: String? = null
 
             // Parse filename from Content-Disposition header
@@ -367,6 +368,11 @@ class OpenMediaAsyncTaskLoader(context: Context, args: Bundle?) : AsyncTaskLoade
         }
     }
 
+    private fun normalizeMimeType(mimeType: String?): String? = when (mimeType) {
+        "application/mp4" -> "video/mp4"
+        else -> mimeType
+    }
+
     private fun guessMimeTypeFromFilename(filename: String): String? {
         val guessedMimeType = URLConnection.guessContentTypeFromName(filename)
         Log.d(Const.OPEN_MEDIA_ASYNC_TASK_LOADER_LOG, "Guessed mimeType: $guessedMimeType for filename: $filename")
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModelTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModelTest.kt
@@ -21,6 +21,7 @@ import com.instructure.canvasapi2.apis.InboxApi
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.BasicUser
 import com.instructure.canvasapi2.models.Conversation
+import com.instructure.canvasapi2.models.MediaComment
 import com.instructure.canvasapi2.models.Message
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.canvasapi2.utils.DataResult
@@ -520,6 +521,22 @@ class InboxDetailsViewModelTest {
         assertEquals(InboxDetailsFragmentAction.OpenAttachment(attachment), events[0])
     }
 
+    @Test
+    fun `Test MessageAction MediaComment onClick`() = runTest {
+        val viewModel = getViewModel()
+        val mediaComment = MediaComment(mediaId = "m-123", displayName = "Video", url = "https://example.com/video.mp4")
+
+        viewModel.messageActionHandler(MessageAction.OpenMediaAttachment(mediaComment))
+
+        val events = mutableListOf<InboxDetailsFragmentAction>()
+        backgroundScope.launch(testDispatcher) {
+            viewModel.events.toList(events)
+        }
+
+        assertEquals(1, events.size)
+        assertEquals(InboxDetailsFragmentAction.OpenMediaAttachment(mediaComment), events[0])
+    }
+
     @Test
     fun `Test MessageAction open url in message`() = runTest {
         val viewModel = getViewModel()

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,9 @@ class InboxDetailsFragment : BaseCanvasFragment(), FragmentInteractions {`
`127`	`127`	`is InboxDetailsFragmentAction.OpenAttachment -> {`
`128`	`128`	`inboxRouter.routeToAttachment(action.attachment)`
`129`	`129`	`}`
	`130`	`+ is InboxDetailsFragmentAction.OpenMediaAttachment -> {`
	`131`	`+ inboxRouter.routeToMediaAttachment(action.mediaComment)`
	`132`	`+ }`
`130`	`133`	`is InboxDetailsFragmentAction.UpdateParentFragment -> {`
`131`	`134`	`sharedEvents.sendEvent(lifecycleScope, InboxSharedAction.RefreshListScreen)`
`132`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,11 @@ class InboxDetailsViewModel @Inject constructor(`
`88`	`88`	`_events.send(InboxDetailsFragmentAction.OpenAttachment(action.attachment))`
`89`	`89`	`}`
`90`	`90`	`}`
	`91`	`+ is MessageAction.OpenMediaAttachment -> {`
	`92`	`+ viewModelScope.launch {`
	`93`	`+ _events.send(InboxDetailsFragmentAction.OpenMediaAttachment(action.mediaComment))`
	`94`	`+ }`
	`95`	`+ }`
`91`	`96`	`is MessageAction.UrlSelected -> {`
`92`	`97`	`viewModelScope.launch {`
`93`	`98`	`_events.send(InboxDetailsFragmentAction.UrlSelected(action.url))`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ data class AttachmentCardItem (`
`23`	`23`	`val status: AttachmentStatus, // TODO: Currently this is not used for proper state handling, but if the upload process will be refactored it can be useful`
`24`	`24`	`val readOnly: Boolean,`
`25`	`25`	`val uploadProgress: Float? = null, // Upload progress from 0.0 to 1.0, null if not uploading`
`26`		`- val workerId: String? = null // WorkManager UUID to track which upload this belongs to`
	`26`	`+ val workerId: String? = null, // WorkManager UUID to track which upload this belongs to`
	`27`	`+ val showFileSize: Boolean = true`
`27`	`28`	`)`
`28`	`29`
`29`	`30`	`enum class AttachmentStatus {`