FIxed showing of main activity alerts
This commit is contained in:
@@ -136,6 +136,7 @@ import com.tutpro.baresip.CustomElements.AlertDialog
|
|||||||
import com.tutpro.baresip.CustomElements.Checkbox
|
import com.tutpro.baresip.CustomElements.Checkbox
|
||||||
import com.tutpro.baresip.CustomElements.DropdownMenu
|
import com.tutpro.baresip.CustomElements.DropdownMenu
|
||||||
import com.tutpro.baresip.CustomElements.LabelText
|
import com.tutpro.baresip.CustomElements.LabelText
|
||||||
|
import com.tutpro.baresip.CustomElements.PasswordDialog
|
||||||
import com.tutpro.baresip.CustomElements.PullToRefreshBox
|
import com.tutpro.baresip.CustomElements.PullToRefreshBox
|
||||||
import com.tutpro.baresip.CustomElements.SelectableAlertDialog
|
import com.tutpro.baresip.CustomElements.SelectableAlertDialog
|
||||||
import com.tutpro.baresip.CustomElements.Text
|
import com.tutpro.baresip.CustomElements.Text
|
||||||
@@ -513,6 +514,15 @@ class MainActivity : ComponentActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (showAlert.value) {
|
||||||
|
AlertDialog(
|
||||||
|
showDialog = showAlert,
|
||||||
|
title = alertTitle.value,
|
||||||
|
message = alertMessage.value,
|
||||||
|
positiveButtonText = stringResource(R.string.ok),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
if (showDialog.value)
|
if (showDialog.value)
|
||||||
AlertDialog(
|
AlertDialog(
|
||||||
showDialog = showDialog,
|
showDialog = showDialog,
|
||||||
@@ -1828,7 +1838,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
val params = account.substringAfter(">")
|
val params = account.substringAfter(">")
|
||||||
if (Utils.paramValue(params, "auth_user") != "" && Utils.paramValue(params, "auth_pass") == "") {
|
if (Utils.paramValue(params, "auth_user") != "" && Utils.paramValue(params, "auth_pass") == "") {
|
||||||
val aor = account.substringAfter("<").substringBefore(">")
|
val aor = account.substringAfter("<").substringBefore(">")
|
||||||
CustomElements.PasswordDialog(
|
PasswordDialog(
|
||||||
ctx = ctx,
|
ctx = ctx,
|
||||||
showPasswordDialog = showPasswordsDialog,
|
showPasswordDialog = showPasswordsDialog,
|
||||||
password = password,
|
password = password,
|
||||||
|
|||||||
Reference in New Issue
Block a user