Set the built-in camera as a lab preference

Author: p1gp1g

vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt

@@ -1582,6 +1582,9 @@ class TimelineFragment :
                     attachmentTypeSelector.setAttachmentVisibility(
                             AttachmentTypeSelectorView.Type.POLL, !isThreadTimeLine()
                     )
+                    attachmentTypeSelector.setAttachmentVisibility(
+                            AttachmentTypeSelectorView.Type.VIDEO_CAMERA, !vectorPreferences.builtinCameraIsEnabled()
+                    )
                 }
                 attachmentTypeSelector.show(views.composerLayout.views.attachmentButton)
             }
@@ -2626,7 +2629,13 @@ class TimelineFragment :
 
     private fun launchAttachmentProcess(type: AttachmentTypeSelectorView.Type) {
         when (type) {
-            AttachmentTypeSelectorView.Type.PHOTO_CAMERA -> attachmentsHelper.openVectorCamera(attachmentVectorCameraActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.PHOTO_CAMERA -> {
+                if (vectorPreferences.builtinCameraIsEnabled()) {
+                    attachmentsHelper.openVectorCamera(attachmentVectorCameraActivityResultLauncher)
+                } else {
+                    attachmentsHelper.openPhotoCamera(attachmentCameraActivityResultLauncher)
+                }
+            }
             AttachmentTypeSelectorView.Type.VIDEO_CAMERA -> attachmentsHelper.openVideoCamera(attachmentCameraVideoActivityResultLauncher)
             AttachmentTypeSelectorView.Type.FILE -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
             AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher)

vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt

@@ -158,11 +158,11 @@ class VectorPreferences @Inject constructor(
         const val SETTINGS_USER_REFUSED_LAZY_LOADING_PREFERENCE_KEY = "SETTINGS_USER_REFUSED_LAZY_LOADING_PREFERENCE_KEY"
         const val SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY = "SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY"
         private const val SETTINGS_USE_JITSI_CONF_PREFERENCE_KEY = "SETTINGS_USE_JITSI_CONF_PREFERENCE_KEY"
-        private const val SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY = "SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY"
         private const val SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY = "SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"
 
         const val SETTINGS_LABS_ALLOW_EXTENDED_LOGS = "SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
         const val SETTINGS_LABS_AUTO_REPORT_UISI = "SETTINGS_LABS_AUTO_REPORT_UISI"
+        const val SETTINGS_LABS_ENABLE_BUILTIN_CAMERA = "SETTINGS_LABS_ENABLE_BUILTIN_CAMERA"
         const val SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME = "SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME"
 
         private const val SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
@@ -361,6 +361,10 @@ class VectorPreferences @Inject constructor(
         return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_LATEX_MATHS, false)
     }
 
+    fun builtinCameraIsEnabled(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_BUILTIN_CAMERA, false)
+    }
+
     fun failFast(): Boolean {
         return buildMeta.isDebug || (developerMode() && defaultPrefs.getBoolean(SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY, false))
     }

vector/src/main/res/values/strings.xml

@@ -3201,6 +3201,7 @@
     <string name="attachment_camera_video">Take a video</string>
     <string name="attachment_camera_capture">Capture</string>
     <string name="attachment_camera_flip">Change camera</string>
+    <string name="labs_enable_builtin_camera">Enable Built-in Camera</string>
 
     <plurals name="room_removed_messages">
         <item quantity="one">%d message removed</item>

vector/src/main/res/xml/vector_settings_labs.xml

@@ -59,6 +59,11 @@
         android:title="@string/labs_enable_latex_maths" />
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:key="SETTINGS_LABS_ENABLE_BUILTIN_CAMERA"
+        android:title="@string/labs_enable_builtin_camera" />
+
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="@bool/settings_labs_thread_messages_default"
         android:key="SETTINGS_LABS_ENABLE_THREAD_MESSAGES_FINAL"