Fixed showing of dialog text in Settings and setting of autostart
This commit is contained in:
@ -114,7 +114,6 @@ class ConfigActivity : ComponentActivity() {
|
|||||||
private lateinit var requestPermissionLauncher: ActivityResultLauncher<String>
|
private lateinit var requestPermissionLauncher: ActivityResultLauncher<String>
|
||||||
private lateinit var requestPermissionsLauncher: ActivityResultLauncher<Array<String>>
|
private lateinit var requestPermissionsLauncher: ActivityResultLauncher<Array<String>>
|
||||||
|
|
||||||
private var managingOverlayPermission = false
|
|
||||||
private var save = false
|
private var save = false
|
||||||
private var restart = false
|
private var restart = false
|
||||||
private var audioRestart = false
|
private var audioRestart = false
|
||||||
@ -380,8 +379,8 @@ class ConfigActivity : ComponentActivity() {
|
|||||||
if (showDialog.value)
|
if (showDialog.value)
|
||||||
AlertDialog(
|
AlertDialog(
|
||||||
showDialog = showDialog,
|
showDialog = showDialog,
|
||||||
title = alertTitle.value,
|
title = dialogTitle.value,
|
||||||
message = alertMessage.value,
|
message = dialogMessage.value,
|
||||||
positiveButtonText = positiveText.value,
|
positiveButtonText = positiveText.value,
|
||||||
onPositiveClicked = onPositiveClicked.value,
|
onPositiveClicked = onPositiveClicked.value,
|
||||||
negativeButtonText = negativeText.value,
|
negativeButtonText = negativeText.value,
|
||||||
@ -448,7 +447,6 @@ class ConfigActivity : ComponentActivity() {
|
|||||||
dialogMessage.value = getString(R.string.appear_on_top_permission)
|
dialogMessage.value = getString(R.string.appear_on_top_permission)
|
||||||
positiveText.value = getString(R.string.ok)
|
positiveText.value = getString(R.string.ok)
|
||||||
onPositiveClicked.value = {
|
onPositiveClicked.value = {
|
||||||
managingOverlayPermission = true
|
|
||||||
val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION)
|
val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION)
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
}
|
}
|
||||||
@ -1297,14 +1295,6 @@ class ConfigActivity : ComponentActivity() {
|
|||||||
registerForActivityResult(ActivityResultContracts.RequestPermission()) {}
|
registerForActivityResult(ActivityResultContracts.RequestPermission()) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResume() {
|
|
||||||
super.onResume()
|
|
||||||
if (managingOverlayPermission) {
|
|
||||||
managingOverlayPermission = false
|
|
||||||
oldAutoStart = isAppearOnTopPermissionGranted(this)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
if (Build.VERSION.SDK_INT >= 33) {
|
if (Build.VERSION.SDK_INT >= 33) {
|
||||||
onBackInvokedDispatcher.unregisterOnBackInvokedCallback(backInvokedCallback)
|
onBackInvokedDispatcher.unregisterOnBackInvokedCallback(backInvokedCallback)
|
||||||
|
|||||||
Reference in New Issue
Block a user