filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Protect calls to FileService.downloadFile()

This commit is contained in:
Benoit Marty 2021-04-07 13:45:43 +02:00
parent 2495fa49f3
commit 511a0c22e2
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View File

@ -1675,10 +1675,12 @@ class RoomDetailFragment @Inject constructor(
shareText(requireContext(), action.messageContent.body) shareText(requireContext(), action.messageContent.body)
} else if (action.messageContent is MessageWithAttachmentContent) { } else if (action.messageContent is MessageWithAttachmentContent) {
lifecycleScope.launch { lifecycleScope.launch {
val data = session.fileService().downloadFile(messageContent = action.messageContent) val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
if (isAdded) { if (!isAdded) return@launch
shareMedia(requireContext(), data, getMimeTypeFromUri(requireContext(), data.toUri())) result.fold(
} { shareMedia(requireContext(), it, getMimeTypeFromUri(requireContext(), it.toUri())) },
{ showErrorInSnackbar(it) }
)
} }
} }
} }
@ -1701,16 +1703,22 @@ class RoomDetailFragment @Inject constructor(
return return
} }
lifecycleScope.launch { lifecycleScope.launch {
val data = session.fileService().downloadFile(messageContent = action.messageContent) val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
if (isAdded) { if (!isAdded) return@launch
result.fold(
{
saveMedia( saveMedia(
context = requireContext(), context = requireContext(),
file = data, file = it,
title = action.messageContent.body, title = action.messageContent.body,
mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), data.toUri()), mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), it.toUri()),
notificationUtils = notificationUtils notificationUtils = notificationUtils
) )
},
{
showErrorInSnackbar(it)
} }
)
} }
} }