From 79858a2336942c38b080a70d91f200c632c62d6b Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Mon, 17 Feb 2025 01:29:33 +0200
Subject: [PATCH] Relying on the flag for voice notes and ignoring empty file
 names as that legacy logic is too outdated now (#947)

---
 .../thoughtcrime/securesms/configs/ConfigToDatabaseSync.kt    | 2 --
 .../messaging/sending_receiving/attachments/Attachment.java   | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/configs/ConfigToDatabaseSync.kt b/app/src/main/java/org/thoughtcrime/securesms/configs/ConfigToDatabaseSync.kt
index 7a90241b7f..6635968231 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/configs/ConfigToDatabaseSync.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/configs/ConfigToDatabaseSync.kt
@@ -38,7 +38,6 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.database.MmsDatabase
 import org.thoughtcrime.securesms.database.MmsSmsDatabase
 import org.thoughtcrime.securesms.database.RecipientDatabase
 import org.thoughtcrime.securesms.database.ThreadDatabase
@@ -64,7 +63,6 @@ class ConfigToDatabaseSync @Inject constructor(
     private val storage: StorageProtocol,
     private val threadDatabase: ThreadDatabase,
     private val recipientDatabase: RecipientDatabase,
-    private val mmsDatabase: MmsDatabase,
     private val pollerFactory: PollerFactory,
     private val clock: SnodeClock,
     private val profileManager: ProfileManager,
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/Attachment.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/Attachment.java
index b8f8070d77..ddf21618e2 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/Attachment.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/Attachment.java
@@ -120,9 +120,7 @@ public abstract class Attachment {
   }
 
   public boolean isVoiceNote() {
-    // A missing file name is the legacy way to determine if an audio attachment is
-    // a voice note vs. other arbitrary audio attachments.
-    return voiceNote || getFileName() == null || getFileName().isEmpty();
+    return voiceNote;
   }
 
   public int getWidth() {