mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
Fix crash when opening in-app Camera for the very first time (#6139)
* fix: correctly handle permission callbacks on Main thread The PermissionUtils was incorrectly executing permission callbacks on a background thread, leading to a Handler error. Now, it is using Main dispatcher. * fix crash when opening camera while having partial storage access
This commit is contained in:
parent
2d6583fea6
commit
9f1fe8737f
1 changed files with 8 additions and 3 deletions
|
|
@ -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() }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue