empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Catch exceptions in share repository for blob provider IO exceptions.

Browse source
This commit is contained in:
Clark 2023-03-22 12:47:14 -04:00 • committed by Greyson Parrelli
parent 57a2a32c71
commit 247edce7b0
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt
View file

@ -60,11 +60,16 @@ class ShareRepository(context: Context) {
val size = getSize(appContext, uri)
val name = getFileName(appContext, uri)
val blobUri = BlobProvider.getInstance()
.forData(stream, size)
.withMimeType(mimeType)
.withFileName(name)
.createForSingleSessionOnDisk(appContext)
val blobUri: Uri = try {
BlobProvider.getInstance()
.forData(stream, size)
.withMimeType(mimeType)
.withFileName(name)
.createForSingleSessionOnDisk(appContext)
} catch (e: IOException) {
Log.e(TAG, "Failed to get blob uri")
return ResolvedShareData.Failure
}
return ResolvedShareData.ExternalUri(
uri = blobUri,
@ -93,16 +98,21 @@ class ShareRepository(context: Context) {
appContext.contentResolver.openInputStream(uri)
} catch (e: IOException) {
Log.w(TAG, "Failed to open: $uri")
return@map null
} ?: return ResolvedShareData.Failure
null
} ?: return@map null
val size = getSize(appContext, uri)
val dimens: Pair<Int, Int> = MediaUtil.getDimensions(appContext, mimeType, uri).toKotlinPair()
val duration = 0L
val blobUri = BlobProvider.getInstance()
.forData(stream, size)
.withMimeType(mimeType)
.createForSingleSessionOnDisk(appContext)
val blobUri = try {
BlobProvider.getInstance()
.forData(stream, size)
.withMimeType(mimeType)
.createForSingleSessionOnDisk(appContext)
} catch (e: IOException) {
Log.w(TAG, "Failed create blob uri")
return@map null
}
Media(
blobUri,