优化
This commit is contained in:
@@ -119,7 +119,7 @@ class PermissionActivity : AppCompatActivity() {
|
|||||||
) {
|
) {
|
||||||
rationaleDialog?.dismiss()
|
rationaleDialog?.dismiss()
|
||||||
if (rationale.isNullOrEmpty()) {
|
if (rationale.isNullOrEmpty()) {
|
||||||
|
finish()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
rationaleDialog = AlertDialog.Builder(this)
|
rationaleDialog = AlertDialog.Builder(this)
|
||||||
@@ -133,6 +133,9 @@ class PermissionActivity : AppCompatActivity() {
|
|||||||
permissions,
|
permissions,
|
||||||
IntArray(0)
|
IntArray(0)
|
||||||
)
|
)
|
||||||
|
finish()
|
||||||
|
}.setOnCancelListener {
|
||||||
|
finish()
|
||||||
}
|
}
|
||||||
.show()
|
.show()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ internal class Request : OnRequestPermissionsResultCallback {
|
|||||||
toNotificationSetting()
|
toNotificationSetting()
|
||||||
} else if (deniedPermissions.size > 1) {
|
} else if (deniedPermissions.size > 1) {
|
||||||
appCtx.startActivity<PermissionActivity> {
|
appCtx.startActivity<PermissionActivity> {
|
||||||
|
putExtra(PermissionActivity.KEY_RATIONALE, rationale)
|
||||||
putExtra(PermissionActivity.KEY_INPUT_REQUEST_TYPE, TYPE_REQUEST_PERMISSION)
|
putExtra(PermissionActivity.KEY_INPUT_REQUEST_TYPE, TYPE_REQUEST_PERMISSION)
|
||||||
putExtra(PermissionActivity.KEY_INPUT_PERMISSIONS_CODE, requestCode)
|
putExtra(PermissionActivity.KEY_INPUT_PERMISSIONS_CODE, requestCode)
|
||||||
putExtra(PermissionActivity.KEY_INPUT_PERMISSIONS, deniedPermissions)
|
putExtra(PermissionActivity.KEY_INPUT_PERMISSIONS, deniedPermissions)
|
||||||
@@ -139,10 +140,8 @@ internal class Request : OnRequestPermissionsResultCallback {
|
|||||||
|
|
||||||
private fun toSetting() {
|
private fun toSetting() {
|
||||||
appCtx.startActivity<PermissionActivity> {
|
appCtx.startActivity<PermissionActivity> {
|
||||||
putExtra(
|
putExtra(PermissionActivity.KEY_RATIONALE, rationale)
|
||||||
PermissionActivity.KEY_INPUT_REQUEST_TYPE,
|
putExtra(PermissionActivity.KEY_INPUT_REQUEST_TYPE, TYPE_REQUEST_SETTING)
|
||||||
TYPE_REQUEST_SETTING
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user