From fd37613f2fdb2681ed49ec3910df72bab9a8bb90 Mon Sep 17 00:00:00 2001
From: Nicholas <nicholas@signal.org>
Date: Tue, 15 Nov 2022 11:07:13 -0500
Subject: [PATCH] Don't fade in media preview controls if hidden.

---
 .../securesms/mediapreview/MediaPreviewV2Fragment.kt      | 2 +-
 .../org/thoughtcrime/securesms/util/FullscreenHelper.java | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

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 550d8af46..d5cf54e73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
@@ -310,7 +310,7 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
   }
 
   private fun crossfadeViewIn(view: View, duration: Long = 200) {
-    if (!view.isVisible) {
+    if (!view.isVisible && !fullscreenHelper.isSystemUiVisible) {
       val viewPropertyAnimator = view.animate()
         .alpha(1f)
         .setDuration(duration)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FullscreenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/util/FullscreenHelper.java
index b27ae7147..b625b0630 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FullscreenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FullscreenHelper.java
@@ -143,14 +143,18 @@ public final class FullscreenHelper {
   }
 
   public void toggleUiVisibility() {
-    int systemUiVisibility = activity.getWindow().getDecorView().getSystemUiVisibility();
-    if ((systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
+    if (isSystemUiVisible()) {
       showSystemUI();
     } else {
       hideSystemUI();
     }
   }
 
+  public boolean isSystemUiVisible() {
+    int systemUiVisibility = activity.getWindow().getDecorView().getSystemUiVisibility();
+    return (systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;
+  }
+
   public void hideSystemUI() {
     activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_IMMERSIVE              |
                                                               View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |