mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 13:53:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into main

Browse source
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
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt
View file

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