Update reaction text for GIFs.

fork-5.53.8
Greyson Parrelli 2021-09-24 09:27:54 -04:00 zatwierdzone przez GitHub
rodzic 29e697265c
commit 32101f7dda
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 17 dodań i 7 usunięć

Wyświetl plik

@ -151,9 +151,9 @@ public class SlideDeck {
return null;
}
public @Nullable String getFirstSlideContentType() {
public @Nullable Slide getFirstSlide() {
if (Util.hasItems(slides)) {
return slides.get(0).getContentType();
return slides.get(0);
}
return null;

Wyświetl plik

@ -61,15 +61,22 @@ sealed class NotificationItemV2(val threadRecipient: Recipient, protected val re
val thumbnailSlide: Slide? = messageRecord.slideDeck.thumbnailSlide
return if (thumbnailSlide == null) {
val slideContentType: String? = messageRecord.slideDeck.firstSlideContentType
if (slideContentType != null) {
slideContentType
val slide: Slide? = messageRecord.slideDeck.firstSlide
if (slide != null && slide.isVideoGif) {
MediaUtil.IMAGE_GIF
} else if (slide != null) {
slide.contentType
} else {
Log.w(TAG, "Could not distinguish view-once content type from message record, defaulting to JPEG")
Log.w(TAG, "Could not distinguish content type from message record, defaulting to JPEG")
MediaUtil.IMAGE_JPEG
}
} else {
thumbnailSlide.contentType
if (thumbnailSlide.isVideoGif) {
MediaUtil.IMAGE_GIF
} else {
thumbnailSlide.contentType
}
}
}
@ -283,6 +290,8 @@ class ReactionNotification(threadRecipient: Recipient, record: MessageRecord, va
context.getString(R.string.MessageNotifier_reacted_s_to_s, EMOJI_REPLACEMENT_STRING, body)
} else if (record.isMediaMessage() && MediaUtil.isVideoType(getMessageContentType((record as MmsMessageRecord)))) {
context.getString(R.string.MessageNotifier_reacted_s_to_your_video, EMOJI_REPLACEMENT_STRING)
} else if (record.isMediaMessage() && MediaUtil.isGif(getMessageContentType((record as MmsMessageRecord)))) {
context.getString(R.string.MessageNotifier_reacted_s_to_your_gif, EMOJI_REPLACEMENT_STRING)
} else if (record.isMediaMessage() && MediaUtil.isImageType(getMessageContentType((record as MmsMessageRecord)))) {
context.getString(R.string.MessageNotifier_reacted_s_to_your_image, EMOJI_REPLACEMENT_STRING)
} else if (record.isMediaMessage() && MediaUtil.isAudioType(getMessageContentType((record as MmsMessageRecord)))) {

Wyświetl plik

@ -1781,6 +1781,7 @@
<string name="MessageNotifier_reacted_s_to_s">Reacted %1$s to: \"%2$s\".</string>
<string name="MessageNotifier_reacted_s_to_your_video">Reacted %1$s to your video.</string>
<string name="MessageNotifier_reacted_s_to_your_image">Reacted %1$s to your image.</string>
<string name="MessageNotifier_reacted_s_to_your_gif">Reacted %1$s to your GIF.</string>
<string name="MessageNotifier_reacted_s_to_your_file">Reacted %1$s to your file.</string>
<string name="MessageNotifier_reacted_s_to_your_audio">Reacted %1$s to your audio.</string>
<string name="MessageNotifier_reacted_s_to_your_view_once_media">Reacted %1$s to your view-once media.</string>