Ask for permission before launching avatar sheet.

signalapp · May 29, 2020 · 5ab72fd · 5ab72fd
1 parent daace9b
commit 5ab72fd
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...ava/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java b/...ava/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.groups.ui.creategroup.details;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +39,7 @@
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -109,8 +111,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     initializeViewModel();
 
-    avatar.setOnClickListener(v -> AvatarSelectionBottomSheetDialogFragment.create(viewModel.hasAvatar(), true, REQUEST_CODE_AVATAR, true)
-                                                                           .show(getChildFragmentManager(), "BOTTOM"));
+    avatar.setOnClickListener(v -> showAvatarSelectionBottomSheet());
     members.setRecipientClickListener(this::handleRecipientClick);
     name.addTextChangedListener(new AfterTextChanged(editable -> viewModel.setName(editable.toString())));
     toolbar.setNavigationOnClickListener(unused -> callback.onNavigationButtonPressed());
@@ -242,6 +243,15 @@ private void setCreateEnabled(boolean isEnabled, boolean animate) {
           .alpha(isEnabled ? 1f : 0.5f);
   }
 
+  private void showAvatarSelectionBottomSheet() {
+    Permissions.with(this)
+               .request(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+               .ifNecessary()
+               .onAnyResult(() -> AvatarSelectionBottomSheetDialogFragment.create(viewModel.hasAvatar(), true, REQUEST_CODE_AVATAR, true)
+                                                                          .show(getChildFragmentManager(), "BOTTOM"))
+               .execute();
+  }
+
   public interface Callback {
     void onGroupCreated(@NonNull RecipientId recipientId, long threadId);
     void onNavigationButtonPressed();