From 07b19402e614ef9cf885a3e52c3ee4835517fc58 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 20 Sep 2021 10:12:59 -0300
Subject: [PATCH] Fix wallpaper gallery toolbar behaviour.

Fixes #11619
---
 .../mediasend/AvatarSelectionActivity.java      |  5 +++++
 .../v2/gallery/MediaGalleryFragment.kt          | 17 +++++++++++------
 .../crop/WallpaperImageSelectionActivity.java   |  8 +++++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
index bfd4b0e91a..4dece8d264 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
@@ -271,4 +271,9 @@ public class AvatarSelectionActivity extends AppCompatActivity implements Camera
   public void onToolbarNavigationClicked() {
     finish();
   }
+
+  @Override
+  public boolean isCameraEnabled() {
+    return true;
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt
index ce36af9afd..8ba5d0a148 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt
@@ -75,13 +75,17 @@ class MediaGalleryFragment : Fragment(R.layout.v2_media_gallery_fragment) {
       onBack()
     }
 
-    toolbar.setOnMenuItemClickListener { item ->
-      if (item.itemId == R.id.action_camera) {
-        callbacks.onNavigateToCamera()
-        true
-      } else {
-        false
+    if (callbacks.isCameraEnabled()) {
+      toolbar.setOnMenuItemClickListener { item ->
+        if (item.itemId == R.id.action_camera) {
+          callbacks.onNavigateToCamera()
+          true
+        } else {
+          false
+        }
       }
+    } else {
+      toolbar.menu.findItem(R.id.action_camera).isVisible = false
     }
 
     countButton.setOnClickListener {
@@ -171,6 +175,7 @@ class MediaGalleryFragment : Fragment(R.layout.v2_media_gallery_fragment) {
   )
 
   interface Callbacks {
+    fun isCameraEnabled(): Boolean = true
     fun isMultiselectEnabled(): Boolean = false
     fun onMediaSelected(media: Media)
     fun onMediaUnselected(media: Media): Unit = throw UnsupportedOperationException()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java
index dcd24b0f69..c112237c7b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java
@@ -92,6 +92,12 @@ public final class WallpaperImageSelectionActivity extends AppCompatActivity
 
   @Override
   public void onToolbarNavigationClicked() {
-    // TODO [alex]
+    setResult(RESULT_CANCELED);
+    finish();
+  }
+
+  @Override
+  public boolean isCameraEnabled() {
+    return false;
   }
 }