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

Fix SaveAttachmentTask NPE

Browse source 
resolves #2454
// FREEBIE
This commit is contained in:
Jake McGinty 2015-02-11 10:37:29 -08:00
parent 352418d2d7
commit b1bf33b13b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
View file

@ -59,10 +59,14 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
return FAILURE; return FAILURE;
} }
File mediaFile = constructOutputFile(attachment.contentType, attachment.date); File mediaFile = constructOutputFile(attachment.contentType, attachment.date);
InputStream inputStream = PartAuthority.getPartStream(context, masterSecret, attachment.uri); InputStream inputStream = PartAuthority.getPartStream(context, masterSecret, attachment.uri);
OutputStream outputStream = new FileOutputStream(mediaFile);
if (inputStream == null) {
return FAILURE;
}
OutputStream outputStream = new FileOutputStream(mediaFile);
Util.copy(inputStream, outputStream); Util.copy(inputStream, outputStream);
MediaScannerConnection.scanFile(context, new String[]{mediaFile.getAbsolutePath()}, MediaScannerConnection.scanFile(context, new String[]{mediaFile.getAbsolutePath()},