ReVanced-Mirror/VancedMicroG
1
0
Fork 0
mirror of https://github.com/TeamVanced/VancedMicroG synced 2025-02-08 00:36:47 +01:00
Code Issues Projects Releases Wiki Activity

EN: Fix permission granting on Android 11

Browse Source
This commit is contained in:
Christian Grigis 2021-07-15 18:07:00 +02:00 committed by Marvin W
parent 1d747f6a83
commit a0558a5f38
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
play-services-nearby-core-ui/src/main/kotlin/org/microg/gms/nearby/core/ui/ExposureNotificationsConfirmActivity.kt
View File

@ -118,14 +118,26 @@ class ExposureNotificationsConfirmActivity : AppCompatActivity() {
} }
private fun requestPermissions() { private fun requestPermissions() {
if (Build.VERSION.SDK_INT >= 23) { when {
requestPermissions(permissions, ++permissionRequestCode) Build.VERSION.SDK_INT >= 30 -> requestPermissions(
permissions.toSet().minus("android.permission.ACCESS_BACKGROUND_LOCATION").toTypedArray(), ++permissionRequestCode
)
Build.VERSION.SDK_INT >= 23 -> requestPermissions(permissions, ++permissionRequestCode)
} }
} }
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) { override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults) super.onRequestPermissionsResult(requestCode, permissions, grantResults)
if (requestCode == this.permissionRequestCode) checkPermissions() if (requestCode == this.permissionRequestCode) {
when {
Build.VERSION.SDK_INT >= 30 && permissions.contains("android.permission.ACCESS_FINE_LOCATION") ->
requestPermissions(
arrayOf("android.permission.ACCESS_BACKGROUND_LOCATION"),
++permissionRequestCode
)
else -> checkPermissions()
}
}
} }
// Bluetooth // Bluetooth