From e74795851a5c2c817a7463979fee3cdaf4f4c036 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 11 Oct 2024 00:37:44 +0200 Subject: [PATCH] use constant to access URI filename --- .../securesms/providers/PersistentBlobProvider.java | 2 +- .../thoughtcrime/securesms/util/SendRelayedMessageUtil.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java b/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java index 5733946ed..f4000c2f9 100644 --- a/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java +++ b/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java @@ -35,7 +35,7 @@ public class PersistentBlobProvider { public static final String EXPECTED_PATH_NEW = "capture-new/*/*/*/*/#"; private static final int MIMETYPE_PATH_SEGMENT = 1; - private static final int FILENAME_PATH_SEGMENT = 2; + public static final int FILENAME_PATH_SEGMENT = 2; private static final int FILESIZE_PATH_SEGMENT = 3; private static final String BLOB_EXTENSION = "blob"; diff --git a/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java b/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java index 794c2cb65..7f696c2be 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java +++ b/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java @@ -10,6 +10,7 @@ import com.b44t.messenger.DcMsg; import org.thoughtcrime.securesms.ConversationListRelayingActivity; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.mms.PartAuthority; +import org.thoughtcrime.securesms.providers.PersistentBlobProvider; import java.io.FileOutputStream; import java.io.InputStream; @@ -112,7 +113,7 @@ public class SendRelayedMessageUtil { private static String getRealPathFromUri(Context context, Uri uri) throws NullPointerException { DcContext dcContext = DcHelper.getContext(context); try { - String filename = uri.getPathSegments().get(2); // Get real file name from Uri + String filename = uri.getPathSegments().get(PersistentBlobProvider.FILENAME_PATH_SEGMENT); String ext = ""; int i = filename.lastIndexOf("."); if (i >= 0) {