Use ActivityCompat
This commit is contained in:
parent
c570be349d
commit
aaee076718
2 changed files with 13 additions and 16 deletions
|
@ -22,6 +22,7 @@ import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.provider.Settings
|
import android.provider.Settings
|
||||||
import androidx.annotation.RequiresApi
|
import androidx.annotation.RequiresApi
|
||||||
|
import androidx.core.app.ActivityCompat
|
||||||
import androidx.core.net.toUri
|
import androidx.core.net.toUri
|
||||||
import androidx.core.text.parseAsHtml
|
import androidx.core.text.parseAsHtml
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
|
@ -79,24 +80,24 @@ class PermissionActivity : AbsMusicServiceActivity() {
|
||||||
binding.appNameText.text = appName
|
binding.appNameText.text = appName
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequiresApi(Build.VERSION_CODES.M)
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
|
super.onResume()
|
||||||
if (hasStoragePermission()) {
|
if (hasStoragePermission()) {
|
||||||
binding.storagePermission.checkImage.isVisible = true
|
binding.storagePermission.checkImage.isVisible = true
|
||||||
binding.storagePermission.checkImage.imageTintList =
|
binding.storagePermission.checkImage.imageTintList =
|
||||||
ColorStateList.valueOf(accentColor())
|
ColorStateList.valueOf(accentColor())
|
||||||
}
|
}
|
||||||
if (hasAudioPermission()) {
|
if (VersionUtils.hasMarshmallow()) {
|
||||||
binding.audioPermission.checkImage.isVisible = true
|
if (hasAudioPermission()) {
|
||||||
binding.audioPermission.checkImage.imageTintList =
|
binding.audioPermission.checkImage.isVisible = true
|
||||||
ColorStateList.valueOf(accentColor())
|
binding.audioPermission.checkImage.imageTintList =
|
||||||
|
ColorStateList.valueOf(accentColor())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
super.onResume()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequiresApi(Build.VERSION_CODES.M)
|
|
||||||
private fun hasStoragePermission(): Boolean {
|
private fun hasStoragePermission(): Boolean {
|
||||||
return checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
|
return ActivityCompat.checkSelfPermission(this , Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequiresApi(Build.VERSION_CODES.M)
|
@RequiresApi(Build.VERSION_CODES.M)
|
||||||
|
|
|
@ -90,17 +90,13 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected open fun requestPermissions() {
|
protected open fun requestPermissions() {
|
||||||
if (VersionUtils.hasMarshmallow()) {
|
ActivityCompat.requestPermissions(this, permissions, PERMISSION_REQUEST)
|
||||||
requestPermissions(permissions, PERMISSION_REQUEST)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected fun hasPermissions(): Boolean {
|
protected fun hasPermissions(): Boolean {
|
||||||
if (VersionUtils.hasMarshmallow()) {
|
for (permission in permissions) {
|
||||||
for (permission in permissions) {
|
if (ActivityCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED) {
|
||||||
if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
|
return false
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue