From 16668574a96bb3db06ef5ee1b3950a0e2c78300f Mon Sep 17 00:00:00 2001
From: Nicholas <nicholas@signal.org>
Date: Fri, 16 Dec 2022 15:32:59 -0500
Subject: [PATCH] Separate message for media decode failure.

---
 .../securesms/mediapreview/MediaPreviewFragment.java         | 1 +
 .../securesms/mediapreview/MediaPreviewV2Fragment.kt         | 5 +++++
 .../securesms/mediapreview/VideoMediaPreviewFragment.java    | 2 +-
 app/src/main/res/values/strings.xml                          | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
index 773cc9a76c..c199f8f0e9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
@@ -96,6 +96,7 @@ public abstract class MediaPreviewFragment extends Fragment {
   public interface Events {
     boolean singleTapOnMedia();
     void onMediaNotAvailable();
+    void unableToPlayMedia();
     void onMediaReady();
     void onPlaying();
     void onStopped();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
index cfaf3cdd75..595bc48aa2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
@@ -436,6 +436,11 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
     debouncer.clear()
   }
 
+  override fun unableToPlayMedia() {
+    Toast.makeText(requireContext(), R.string.MediaPreviewActivity_unable_to_play_media, Toast.LENGTH_LONG).show()
+    requireActivity().finish()
+  }
+
   private fun forward(mediaItem: MediaTable.MediaRecord) {
     val attachment = mediaItem.attachment
     val uri = attachment?.uri
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
index 2f5f90f716..5a6782a9c8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
@@ -84,7 +84,7 @@ public final class VideoMediaPreviewFragment extends MediaPreviewFragment {
 
       @Override
       public void onError() {
-        events.onMediaNotAvailable();
+        events.unableToPlayMedia();
       }
     });
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82aee4f76e..ef2f76b42d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1988,6 +1988,8 @@
     <!-- All media preview title when viewing media sent by another recipient to you (allows changing of \'You\' based on context) -->
     <string name="MediaPreviewActivity_s_to_you">%1$s to you</string>
     <string name="MediaPreviewActivity_media_no_longer_available">Media no longer available.</string>
+    <!-- Notifying the user that the device has encountered a technical issue and is unable to render a video. -->
+    <string name="MediaPreviewActivity_unable_to_play_media">Unable to play media.</string>
     <string name="MediaPreviewActivity_error_finding_message">Error finding message.</string>
     <string name="MediaPreviewActivity_cant_find_an_app_able_to_share_this_media">Can\'t find an app able to share this media.</string>
     <string name="MediaPreviewActivity_dismiss_due_to_error">Close</string>