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

Null check Media URI in save task.

Browse source
This commit is contained in:
Nicholas 2023-01-31 10:58:02 -05:00 • committed by Nicholas Tinsley
parent dca47e4cb5
commit 5febe6490c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
View file

@ -120,6 +120,12 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
CreateMediaUriResult result = createMediaUri(getMediaStoreContentUriForType(contentType), contentType, fileName);
ContentValues updateValues = new ContentValues();
final Uri mediaUri = result.mediaUri;
if (mediaUri == null) {
return null;
}
try (InputStream inputStream = PartAuthority.getAttachmentStream(context, attachment.uri)) {
if (inputStream == null) {
@ -127,12 +133,12 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
}
if (Objects.equals(result.outputUri.getScheme(), ContentResolver.SCHEME_FILE)) {
try (OutputStream outputStream = new FileOutputStream(result.mediaUri.getPath())) {
try (OutputStream outputStream = new FileOutputStream(mediaUri.getPath())) {
StreamUtil.copy(inputStream, outputStream);
MediaScannerConnection.scanFile(context, new String[] { result.mediaUri.getPath() }, new String[] { contentType }, null);
MediaScannerConnection.scanFile(context, new String[] { mediaUri.getPath() }, new String[] { contentType }, null);
}
} else {
try (OutputStream outputStream = context.getContentResolver().openOutputStream(result.mediaUri, "w")) {
try (OutputStream outputStream = context.getContentResolver().openOutputStream(mediaUri, "w")) {
long total = StreamUtil.copy(inputStream, outputStream);
if (total > 0) {
updateValues.put(MediaStore.MediaColumns.SIZE, total);
@ -146,7 +152,7 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
}
if (updateValues.size() > 0) {
getContext().getContentResolver().update(result.mediaUri, updateValues, null, null);
getContext().getContentResolver().update(mediaUri, updateValues, null, null);
}
return result.outputUri.getLastPathSegment();