From da536f1ed9f4869ada417eb4833fe9a4a6be46da Mon Sep 17 00:00:00 2001 From: Hocuri Date: Mon, 11 May 2020 11:37:52 +0200 Subject: [PATCH] Fix #1347 Draft file name "Unknown". getManuallyCalculatedSlideInfo() in AttatchmentManager sometimes failed to get a file name. Now, in this case, it is just extracted from the uri. --- src/org/thoughtcrime/securesms/mms/AttachmentManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java index 61a26692f..1d82d7cc8 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -60,6 +60,7 @@ import org.thoughtcrime.securesms.util.concurrent.SettableFuture; import org.thoughtcrime.securesms.util.guava.Optional; import org.thoughtcrime.securesms.util.views.Stub; +import java.io.File; import java.io.IOException; import java.util.Iterator; import java.util.LinkedList; @@ -352,6 +353,10 @@ public class AttachmentManager { height = dimens.second; } + if (fileName == null) { + fileName = new File(uri.getPath()).getName(); + } + Log.w(TAG, "local slide with size " + mediaSize + " took " + (System.currentTimeMillis() - start) + "ms"); return mediaType.createSlide(context, uri, fileName, mimeType, mediaSize, width, height); }