From 8646dd3450b08c27e3952f8895c68086a2f7c6d3 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 28 Mar 2025 14:07:12 +0100 Subject: [PATCH] remove permission checks for new photo picker The new photo picker does not need files permission. For other features, the permissions are already checked elsewhere Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/jobs/UploadAndShareFilesWorker.kt | 10 ---------- .../talk/ui/dialog/FileAttachmentPreviewFragment.kt | 9 ++------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt index 0161003f3..5a3526de9 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt @@ -89,16 +89,6 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa override fun doWork(): Result { NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this) - if (!platformPermissionUtil.isFilesPermissionGranted()) { - Log.w( - TAG, - "Storage permission is not granted. As a developer please make sure you check for" + - "permissions via UploadAndShareFilesWorker.isStoragePermissionGranted() and " + - "UploadAndShareFilesWorker.requestStoragePermission() beforehand. If you already " + - "did but end up with this warning, the user most likely revoked the permission" - ) - } - return try { currentUser = currentUserProvider.currentUser.blockingGet() val sourceFile = inputData.getString(DEVICE_SOURCE_FILE) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt index 0be7ecb1e..c23bba00a 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt @@ -17,7 +17,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.nextcloud.talk.R import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.databinding.DialogFileAttachmentPreviewBinding -import com.nextcloud.talk.jobs.UploadAndShareFilesWorker import com.nextcloud.talk.ui.theme.ViewThemeUtils import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil import javax.inject.Inject @@ -70,12 +69,8 @@ class FileAttachmentPreviewFragment : DialogFragment() { } binding.buttonSend.setOnClickListener { - if (permissionUtil.isFilesPermissionGranted()) { - val caption: String = binding.dialogFileAttachmentPreviewCaption.text.toString() - uploadFiles(filesList, caption) - } else { - UploadAndShareFilesWorker.requestStoragePermission(requireActivity()) - } + val caption: String = binding.dialogFileAttachmentPreviewCaption.text.toString() + uploadFiles(filesList, caption) dismiss() } }