From 33c6c4692f09e140deb1f1b5dda9cf96953d437a Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Thu, 3 Apr 2025 10:00:18 +1100 Subject: [PATCH] Fixing store crashes --- .../java/org/thoughtcrime/securesms/ApplicationContext.kt | 2 +- .../org/thoughtcrime/securesms/MediaPreviewActivity.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt index a0eb7b6cd0..b976394d60 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt @@ -205,7 +205,7 @@ class ApplicationContext : Application(), DefaultLifecycleObserver, @Volatile var isAppVisible: Boolean = false - override fun getSystemService(name: String): Any { + override fun getSystemService(name: String): Any? { if (MessagingModuleConfiguration.MESSAGING_MODULE_SERVICE == name) { return messagingModuleConfiguration!! } diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index 293e2b9ee0..1af080236d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -429,9 +429,12 @@ public class MediaPreviewActivity extends ScreenLockActionBarActivity implements String mediaFilename = ""; if (mediaItem.attachment != null) { mediaFilename = mediaItem.attachment.getFilename(); - } else { + } + + if(mediaFilename == null || mediaFilename.isEmpty()){ mediaFilename = FilenameUtils.getFilenameFromUri(MediaPreviewActivity.this, mediaItem.uri, mediaItem.mimeType); } + final String outputFilename = mediaFilename; // We need a `final` value for the saveTask, below Log.i(TAG, "About to save media as: " + outputFilename);