diff --git a/AnkiDroid/src/main/AndroidManifest.xml b/AnkiDroid/src/main/AndroidManifest.xml index 7819613e76..6d4dd7c82b 100644 --- a/AnkiDroid/src/main/AndroidManifest.xml +++ b/AnkiDroid/src/main/AndroidManifest.xml @@ -27,8 +27,6 @@ - - diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaImageFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaImageFragment.kt index c43453dfe8..b753c3c5ef 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaImageFragment.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaImageFragment.kt @@ -17,7 +17,6 @@ package com.ichi2.anki.multimedia -import android.Manifest import android.app.Activity import android.content.Context import android.content.Intent @@ -55,7 +54,6 @@ import com.ichi2.utils.BitmapUtil import com.ichi2.utils.ExifUtil import com.ichi2.utils.FileUtil import com.ichi2.utils.ImageUtils -import com.ichi2.utils.Permissions import com.ichi2.utils.message import com.ichi2.utils.negativeButton import com.ichi2.utils.positiveButton @@ -143,6 +141,7 @@ class MultimediaImageFragment : MultimediaFragment(R.layout.fragment_multimedia_ * Launches the device's camera to take a picture. * This launcher is registered using `ActivityResultContracts.TakePicture()`. */ + @NeedsTest("Works fine without permission as we use Camera as feature") private val cameraLauncher = registerForActivityResult(ActivityResultContracts.TakePicture()) { isPictureTaken -> when { @@ -240,37 +239,10 @@ class MultimediaImageFragment : MultimediaFragment(R.layout.fragment_multimedia_ imagePreview = view.findViewById(R.id.image_preview) imageFileSize = view.findViewById(R.id.image_size_textview) - if (selectedImageOptions == ImageOptions.CAMERA) { - if (!hasCameraPermission()) { - return - } - } - handleImageUri() setupDoneButton() } - private val requestPermissionLauncher = registerForActivityResult( - ActivityResultContracts.RequestPermission() - ) { isGranted -> - if (isGranted) { - Timber.d("Camera permission granted") - handleSelectedImageOptions() - } else { - Timber.d("Camera permission denied") - showErrorDialog(resources.getString(R.string.multimedia_editor_camera_permission_refused)) - } - } - - private fun hasCameraPermission(): Boolean { - if (!Permissions.canRecordAudio(requireContext())) { - Timber.i("Requesting Audio Permissions") - requestPermissionLauncher.launch(Manifest.permission.CAMERA) - return false - } - return true - } - private fun handleImageUri() { if (imageUri != null) { view?.findViewById(R.id.no_image_textview)?.visibility = View.GONE diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt b/AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt index 8f4b8594c3..1a2d6a3f8b 100644 --- a/AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt +++ b/AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt @@ -54,10 +54,6 @@ object Permissions { Manifest.permission.WRITE_EXTERNAL_STORAGE ) - fun canUseCamera(context: Context): Boolean { - return hasPermission(context, Manifest.permission.CAMERA) - } - fun canRecordAudio(context: Context): Boolean { return hasPermission(context, Manifest.permission.RECORD_AUDIO) } diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml index 476a5f5afd..920af4963e 100644 --- a/AnkiDroid/src/main/res/values/03-dialogs.xml +++ b/AnkiDroid/src/main/res/values/03-dialogs.xml @@ -125,7 +125,6 @@ Could not obtain microphone permission. - Could not obtain camera permission. Functionality has been disabled. Failed to open Multimedia Editor