Fix wallpaper gallery toolbar behaviour.

Fixes #11619

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;
+  }
 }

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()

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;
   }
 }