diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt index 7b95255e1a..745a7db6ac 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt @@ -31,7 +31,6 @@ import org.thoughtcrime.securesms.groups.ParcelableGroupId import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity import org.thoughtcrime.securesms.mediasend.Media import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil -import org.thoughtcrime.securesms.permissions.PermissionCompat import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter @@ -243,18 +242,8 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) { @Suppress("DEPRECATION") private fun openGallery() { - Permissions.with(this) - .request(*PermissionCompat.forImages()) - .ifNecessary() - .onAllGranted { - val intent = AvatarSelectionActivity.getIntentForGallery(requireContext()) - startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE) - } - .onAnyDenied { - Toast.makeText(requireContext(), R.string.AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission, Toast.LENGTH_SHORT) - .show() - } - .execute() + val intent = AvatarSelectionActivity.getIntentForGallery(requireContext()) + startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE) } @Deprecated("Deprecated in Java") diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionNavigator.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionNavigator.kt index bca57bf84e..0209f2398b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionNavigator.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionNavigator.kt @@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment import androidx.navigation.NavController import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil -import org.thoughtcrime.securesms.permissions.PermissionCompat import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.util.navigation.safeNavigate @@ -47,17 +46,5 @@ class MediaSelectionNavigator( .execute() } } - - fun Fragment.requestPermissionsForGallery( - onGranted: () -> Unit - ) { - Permissions.with(this) - .request(*PermissionCompat.forImagesAndVideos()) - .ifNecessary() - .withPermanentDenialDialog(getString(R.string.AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos)) - .onAllGranted(onGranted) - .onAnyDenied { Toast.makeText(this.requireContext(), R.string.AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos, Toast.LENGTH_LONG).show() } - .execute() - } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt index ddd3c82ed6..3aa87c2bea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt @@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.mediasend.CameraFragment import org.thoughtcrime.securesms.mediasend.Media import org.thoughtcrime.securesms.mediasend.v2.HudCommand import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator -import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator.Companion.requestPermissionsForGallery import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel import org.thoughtcrime.securesms.mms.MediaConstraints import org.thoughtcrime.securesms.permissions.Permissions @@ -160,10 +159,8 @@ class MediaCaptureFragment : Fragment(R.layout.fragment_container), CameraFragme override fun onGalleryClicked() { val controller = findNavController() - requestPermissionsForGallery { - captureChildFragment.fadeOutControls { - navigator.goToGallery(controller) - } + captureChildFragment.fadeOutControls { + navigator.goToGallery(controller) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt index 67249f0039..c3be07b5db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt @@ -50,7 +50,6 @@ import org.thoughtcrime.securesms.mediasend.MediaSendActivityResult import org.thoughtcrime.securesms.mediasend.v2.HudCommand import org.thoughtcrime.securesms.mediasend.v2.MediaAnimations import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator -import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator.Companion.requestPermissionsForGallery import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionState import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel import org.thoughtcrime.securesms.mediasend.v2.MediaValidator @@ -442,9 +441,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul private fun launchGallery() { val controller = findNavController() - requestPermissionsForGallery { - navigator.goToGallery(controller) - } + navigator.goToGallery(controller) } private fun performSend(selection: List = listOf()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java index c8ad4ed300..d8ebf330cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java @@ -1,13 +1,11 @@ package org.thoughtcrime.securesms.wallpaper; -import android.Manifest; import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -18,8 +16,6 @@ import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.permissions.PermissionCompat; -import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.wallpaper.crop.WallpaperImageSelectionActivity; public class ChatWallpaperSelectionFragment extends Fragment { @@ -40,7 +36,7 @@ public class ChatWallpaperSelectionFragment extends Fragment { RecyclerView recyclerView = view.findViewById(R.id.chat_wallpaper_recycler); chooseFromPhotos.setOnClickListener(unused -> { - askForPermissionIfNeededAndLaunchPhotoSelection(); + startActivityForResult(WallpaperImageSelectionActivity.getIntent(requireContext(), viewModel.getRecipientId()), CHOOSE_WALLPAPER); }); toolbar.setTitle(R.string.preferences__chat_color_and_wallpaper); @@ -74,16 +70,4 @@ public class ChatWallpaperSelectionFragment extends Fragment { super.onActivityResult(requestCode, resultCode, data); } } - - private void askForPermissionIfNeededAndLaunchPhotoSelection() { - Permissions.with(this) - .request(PermissionCompat.forImages()) - .ifNecessary() - .onAllGranted(() -> { - startActivityForResult(WallpaperImageSelectionActivity.getIntent(requireContext(), viewModel.getRecipientId()), CHOOSE_WALLPAPER); - }) - .onAnyDenied(() -> Toast.makeText(requireContext(), R.string.ChatWallpaperPreviewActivity__viewing_your_gallery_requires_the_storage_permission, Toast.LENGTH_SHORT) - .show()) - .execute(); - } }