From 08866e0bea9c5aa5b440c6ead1157d4434d7af14 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Thu, 15 Jun 2023 15:36:14 -0300 Subject: [PATCH] feat: add check for if device has a camera before sending out the image capture intent --- .../org/joinmastodon/android/fragments/ComposeFragment.java | 6 +++++- mastodon/src/main/res/values/strings_mo.xml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 807b7382e..6f5544e48 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -1486,7 +1486,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri); - startActivityForResult(cameraIntent, CAMERA_PIC_REQUEST_CODE); + if(getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)){ + startActivityForResult(cameraIntent, CAMERA_PIC_REQUEST_CODE); + } else { + Toast.makeText(getContext(), R.string.mo_camera_not_available, Toast.LENGTH_SHORT); + } } else { getActivity().requestPermissions(new String[]{Manifest.permission.CAMERA}, CAMERA_PERMISSION_CODE); } diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml index b55cfe836..89790e4d0 100644 --- a/mastodon/src/main/res/values/strings_mo.xml +++ b/mastodon/src/main/res/values/strings_mo.xml @@ -33,6 +33,7 @@ Composer\'s Behavior Manage Notifications Take picture + No camera available! Add new poll option