From 511a0c22e245e1431dc0f2f5690538621be437a1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 13:45:43 +0200
Subject: [PATCH] Protect calls to FileService.downloadFile()

---
 .../home/room/detail/RoomDetailFragment.kt    | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index b2e7004d0f..b7e2e189d3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1675,10 +1675,12 @@ class RoomDetailFragment @Inject constructor(
             shareText(requireContext(), action.messageContent.body)
         } else if (action.messageContent is MessageWithAttachmentContent) {
             lifecycleScope.launch {
-                val data = session.fileService().downloadFile(messageContent = action.messageContent)
-                if (isAdded) {
-                    shareMedia(requireContext(), data, getMimeTypeFromUri(requireContext(), data.toUri()))
-                }
+                val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
+                if (!isAdded) return@launch
+                result.fold(
+                        { shareMedia(requireContext(), it, getMimeTypeFromUri(requireContext(), it.toUri())) },
+                        { showErrorInSnackbar(it) }
+                )
             }
         }
     }
@@ -1701,16 +1703,22 @@ class RoomDetailFragment @Inject constructor(
             return
         }
         lifecycleScope.launch {
-            val data = session.fileService().downloadFile(messageContent = action.messageContent)
-            if (isAdded) {
-                saveMedia(
-                        context = requireContext(),
-                        file = data,
-                        title = action.messageContent.body,
-                        mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), data.toUri()),
-                        notificationUtils = notificationUtils
-                )
-            }
+            val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
+            if (!isAdded) return@launch
+            result.fold(
+                    {
+                        saveMedia(
+                                context = requireContext(),
+                                file = it,
+                                title = action.messageContent.body,
+                                mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), it.toUri()),
+                                notificationUtils = notificationUtils
+                        )
+                    },
+                    {
+                        showErrorInSnackbar(it)
+                    }
+            )
         }
     }