From ae335c1226529d11214bc1fab8ecac7f5a6bde8a Mon Sep 17 00:00:00 2001
From: Infi <infi@infi.sh>
Date: Thu, 7 Mar 2024 21:33:51 +0100
Subject: [PATCH] fix: issue in which camera nonpresence can cause a crash

Signed-off-by: Infi <infi@infi.sh>
---
 .../screens/chat/views/channel/ChannelScreen.kt     | 13 ++++++++++++-
 app/src/main/res/values/strings.xml                 |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
index 0d10dc81..25521749 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
@@ -575,7 +575,18 @@ fun ChannelScreen(
                                 contentValues
                             )
 
-                            pickCameraLauncher.launch(capturedPhotoUri.value)
+                            try {
+                                pickCameraLauncher.launch(capturedPhotoUri.value)
+                            } catch (e: Exception) {
+                                Toast.makeText(
+                                    context,
+                                    context.getString(
+                                        R.string.file_picker_chip_camera_none_installed
+                                    ),
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }
+                            
                             viewModel.currentBottomPane = BottomPane.None
                         },
                         onClose = {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d397dc9..adbd1fd1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -447,6 +447,7 @@
     <string name="file_picker_permission_unpartialise_request_cta">Allow full access</string>
     <string name="file_picker_chip_documents">Attach a file</string>
     <string name="file_picker_chip_camera">Take a photo</string>
+    <string name="file_picker_chip_camera_none_installed">No camera app installed</string>
 
     <string name="inline_media_picker_current_description">Currently selected media</string>
     <string name="inline_media_picker_no_media_placeholder">Pick media…</string>