mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-20 12:09:45 +01:00
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 <dev@mhibbe.de>
This commit is contained in:
parent
8009cc1013
commit
8646dd3450
@ -89,16 +89,6 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
|
|||||||
override fun doWork(): Result {
|
override fun doWork(): Result {
|
||||||
NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
|
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 {
|
return try {
|
||||||
currentUser = currentUserProvider.currentUser.blockingGet()
|
currentUser = currentUserProvider.currentUser.blockingGet()
|
||||||
val sourceFile = inputData.getString(DEVICE_SOURCE_FILE)
|
val sourceFile = inputData.getString(DEVICE_SOURCE_FILE)
|
||||||
|
@ -17,7 +17,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
|||||||
import com.nextcloud.talk.R
|
import com.nextcloud.talk.R
|
||||||
import com.nextcloud.talk.application.NextcloudTalkApplication
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
||||||
import com.nextcloud.talk.databinding.DialogFileAttachmentPreviewBinding
|
import com.nextcloud.talk.databinding.DialogFileAttachmentPreviewBinding
|
||||||
import com.nextcloud.talk.jobs.UploadAndShareFilesWorker
|
|
||||||
import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
||||||
import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil
|
import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@ -70,12 +69,8 @@ class FileAttachmentPreviewFragment : DialogFragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
binding.buttonSend.setOnClickListener {
|
binding.buttonSend.setOnClickListener {
|
||||||
if (permissionUtil.isFilesPermissionGranted()) {
|
|
||||||
val caption: String = binding.dialogFileAttachmentPreviewCaption.text.toString()
|
val caption: String = binding.dialogFileAttachmentPreviewCaption.text.toString()
|
||||||
uploadFiles(filesList, caption)
|
uploadFiles(filesList, caption)
|
||||||
} else {
|
|
||||||
UploadAndShareFilesWorker.requestStoragePermission(requireActivity())
|
|
||||||
}
|
|
||||||
dismiss()
|
dismiss()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user