Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add check for if device has a camera before sending out the image capture intent

This commit is contained in:
LucasGGamerM 2023-06-15 15:36:14 -03:00
parent a177d35c4f
commit 08866e0bea
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

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

1
mastodon/src/main/res/values/strings_mo.xml
View File

@ -33,6 +33,7 @@
<string name="mo_composer_behavior">Composer\'s Behavior</string>
<string name="mo_notification_management_settings">Manage Notifications</string>
<string name="mo_open_camera">Take picture</string>
<string name="mo_camera_not_available">No camera available!</string>
<!-- accessibility labels-->
<string name="mo_poll_option_add">Add new poll option</string>