Merge branch 'main' into main

This commit is contained in:
Nicolas Raoul 2025-01-17 15:37:31 +09:00 committed by GitHub
commit d4950b170b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -16,6 +16,9 @@ import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import fr.free.nrw.commons.R
import fr.free.nrw.commons.upload.UploadActivity
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
object PermissionUtils {
@ -130,7 +133,7 @@ object PermissionUtils {
vararg permissions: String
) {
if (hasPartialAccess(activity)) {
Thread(onPermissionGranted).start()
CoroutineScope(Dispatchers.Main).launch { onPermissionGranted.run() }
return
}
checkPermissionsAndPerformAction(
@ -166,13 +169,15 @@ object PermissionUtils {
rationaleMessage: Int,
vararg permissions: String
) {
val scope = CoroutineScope(Dispatchers.Main)
Dexter.withActivity(activity)
.withPermissions(*permissions)
.withListener(object : MultiplePermissionsListener {
override fun onPermissionsChecked(report: MultiplePermissionsReport) {
when {
report.areAllPermissionsGranted() || hasPartialAccess(activity) ->
Thread(onPermissionGranted).start()
scope.launch { onPermissionGranted.run() }
report.isAnyPermissionPermanentlyDenied -> {
DialogUtil.showAlertDialog(
activity,
@ -189,7 +194,7 @@ object PermissionUtils {
null, null
)
}
else -> Thread(onPermissionDenied).start()
else -> scope.launch { onPermissionDenied?.run() }
}
}