From c0d5c22a2163ab58c2d1b7cf5e383643a55d67fa Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Wed, 2 Sep 2020 16:59:52 +1000 Subject: [PATCH 1/3] WIP: show attachment in conversation preview as iOS --- res/values/strings.xml | 4 +++ .../securesms/database/ThreadDatabase.java | 10 +++++-- src/org/thoughtcrime/securesms/mms/Slide.java | 29 ++++++++++++++++++- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 4a2b5ca5e3..d61a5ce87c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1855,4 +1855,8 @@ Secure session reset done + + Attachment + Voice Message + diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java index 1de021e206..d614b412f7 100644 --- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -618,9 +618,13 @@ public class ThreadDatabase extends Database { } private @NonNull String getFormattedBodyFor(@NonNull MessageRecord messageRecord) { - if (messageRecord.isMms() && ((MmsMessageRecord) messageRecord).getSharedContacts().size() > 0) { - Contact contact = ((MmsMessageRecord) messageRecord).getSharedContacts().get(0); - return ContactUtil.getStringSummary(context, contact).toString(); + if (messageRecord.isMms()) { + MmsMessageRecord record = (MmsMessageRecord) messageRecord; + if (record.getSlideDeck().getBody()) + if (record.getSharedContacts().size() > 0) { + Contact contact = ((MmsMessageRecord) messageRecord).getSharedContacts().get(0); + return ContactUtil.getStringSummary(context, contact).toString(); + } } return messageRecord.getBody(); diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/org/thoughtcrime/securesms/mms/Slide.java index 2c5dc1cb16..bd3838c4aa 100644 --- a/src/org/thoughtcrime/securesms/mms/Slide.java +++ b/src/org/thoughtcrime/securesms/mms/Slide.java @@ -22,6 +22,7 @@ import android.net.Uri; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.google.android.exoplayer2.util.MimeTypes; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.UriAttachment; @@ -33,6 +34,8 @@ import org.whispersystems.libsignal.util.guava.Optional; import java.security.SecureRandom; +import network.loki.messenger.R; + public abstract class Slide { protected final Attachment attachment; @@ -59,7 +62,31 @@ public abstract class Slide { @NonNull public Optional getBody() { - return Optional.absent(); + String attachmentString = context.getString(R.string.attachment); + + if (MimeTypes.isAudio(attachment.getContentType())) { + // a missing filename is the legacy way to determine if an audio attachment is + // a voice note vs. other arbitrary audio attachments. + if (attachment.isVoiceNote() || !attachment.getFileName().isEmpty()) { + attachmentString = context.getString(R.string.attachment_type_voice_message); + return Optional.fromNullable("🎤 " + attachmentString); + } + } + return Optional.fromNullable(emojiForMimeType(attachment.getContentType()) + attachmentString); + } + + private String emojiForMimeType(String contentType) { + if (MimeTypes.isVideo(contentType)) { + return "📷 "; + } else if (MimeTypes.isVideo(contentType)) { + return "🎥 "; + } else if (MimeTypes.isAudio(contentType)) { + return "🎧 "; + } else if (MimeTypes.is) { + return "🎡 "; + } else { + return "📎 "; + } } @NonNull From f42855f43ec491bc92f238f0000828d8bc157d75 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Thu, 3 Sep 2020 14:41:00 +1000 Subject: [PATCH 2/3] show attachment emoji in conversation previews --- .../securesms/database/ThreadDatabase.java | 9 +++++++-- .../securesms/mms/OutgoingMediaMessage.java | 7 ++----- src/org/thoughtcrime/securesms/mms/Slide.java | 20 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java index d614b412f7..41903ae23e 100644 --- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -620,13 +620,18 @@ public class ThreadDatabase extends Database { private @NonNull String getFormattedBodyFor(@NonNull MessageRecord messageRecord) { if (messageRecord.isMms()) { MmsMessageRecord record = (MmsMessageRecord) messageRecord; - if (record.getSlideDeck().getBody()) if (record.getSharedContacts().size() > 0) { Contact contact = ((MmsMessageRecord) messageRecord).getSharedContacts().get(0); return ContactUtil.getStringSummary(context, contact).toString(); } + String attachmentString = record.getSlideDeck().getBody(); + if (!attachmentString.isEmpty()) { + if (!messageRecord.getBody().isEmpty()) { + attachmentString = attachmentString + ": " + messageRecord.getBody(); + } + return attachmentString; + } } - return messageRecord.getBody(); } diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java index 6a73726448..cb5252a657 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java @@ -146,13 +146,10 @@ public class OutgoingMediaMessage { } private static String buildMessage(SlideDeck slideDeck, String message) { - if (!TextUtils.isEmpty(message) && !TextUtils.isEmpty(slideDeck.getBody())) { - return slideDeck.getBody() + "\n\n" + message; - } else if (!TextUtils.isEmpty(message)) { + if (!TextUtils.isEmpty(message)) { return message; - } else { - return slideDeck.getBody(); } + return ""; } } diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/org/thoughtcrime/securesms/mms/Slide.java index bd3838c4aa..fe9a7a9b77 100644 --- a/src/org/thoughtcrime/securesms/mms/Slide.java +++ b/src/org/thoughtcrime/securesms/mms/Slide.java @@ -22,8 +22,6 @@ import android.net.Uri; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.google.android.exoplayer2.util.MimeTypes; - import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.UriAttachment; import org.thoughtcrime.securesms.database.AttachmentDatabase; @@ -64,7 +62,7 @@ public abstract class Slide { public Optional getBody() { String attachmentString = context.getString(R.string.attachment); - if (MimeTypes.isAudio(attachment.getContentType())) { + if (MediaUtil.isAudio(attachment)) { // a missing filename is the legacy way to determine if an audio attachment is // a voice note vs. other arbitrary audio attachments. if (attachment.isVoiceNote() || !attachment.getFileName().isEmpty()) { @@ -72,20 +70,20 @@ public abstract class Slide { return Optional.fromNullable("🎤 " + attachmentString); } } - return Optional.fromNullable(emojiForMimeType(attachment.getContentType()) + attachmentString); + return Optional.fromNullable(emojiForMimeType() + attachmentString); } - private String emojiForMimeType(String contentType) { - if (MimeTypes.isVideo(contentType)) { + private String emojiForMimeType() { + if (MediaUtil.isImage(attachment)) { return "📷 "; - } else if (MimeTypes.isVideo(contentType)) { + } else if (MediaUtil.isVideo(attachment)) { return "🎥 "; - } else if (MimeTypes.isAudio(contentType)) { + } else if (MediaUtil.isAudio(attachment)) { return "🎧 "; - } else if (MimeTypes.is) { - return "🎡 "; - } else { + } else if (MediaUtil.isFile(attachment)) { return "📎 "; + } else { + return "🎡 "; } } From d575867d6b7afefb7adf7326ce5ee936279dcad4 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Thu, 3 Sep 2020 15:07:59 +1000 Subject: [PATCH 3/3] show attachment emoji in notification --- .../securesms/notifications/DefaultMessageNotifier.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index 6945c05027..974667cb6f 100644 --- a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -479,13 +479,13 @@ public class DefaultMessageNotifier implements MessageNotifier { body = SpanUtil.italic(context.getString(R.string.MessageNotifier_sticker)); slideDeck = ((MmsMessageRecord) record).getSlideDeck(); } else if (record.isMms() && TextUtils.isEmpty(body) && !((MmsMessageRecord) record).getSlideDeck().getSlides().isEmpty()) { - body = SpanUtil.italic(context.getString(R.string.MessageNotifier_media_message)); slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck(); + body = SpanUtil.italic(slideDeck.getBody()); } else if (record.isMms() && !record.isMmsNotification() && !((MmsMessageRecord) record).getSlideDeck().getSlides().isEmpty()) { - String message = context.getString(R.string.MessageNotifier_media_message_with_text, body); + slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck(); + String message = slideDeck.getBody() + ": " + record.getBody(); int italicLength = message.length() - body.length(); body = SpanUtil.italic(message, italicLength); - slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck(); } if (threadRecipients == null || !threadRecipients.isMuted()) {