From fc62cd75f08c7194fff9aad6a096ebc721214c5c Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 15 Mar 2023 05:20:27 +0200 Subject: [PATCH] Prevent dismiss of Android contact concent dialog --- app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt | 7 +++++-- app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt index c5bc24a4..3c076b7d 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt @@ -339,9 +339,12 @@ class ConfigActivity : AppCompatActivity() { contactsSpinner.setSelection(contactsModeKeys.indexOf(oldContactsMode)) dialog.dismiss() } - show().apply { + val dialog = this.create() + dialog.setCancelable(false) + dialog.setCanceledOnTouchOutside(false) + dialog.show().apply { findViewById(android.R.id.message) - ?.movementMethod = LinkMovementMethod.getInstance() + ?.movementMethod = LinkMovementMethod.getInstance() } } } diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index 04e93cc2..f1d3ab58 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -1643,7 +1643,6 @@ class MainActivity : AppCompatActivity() { input.requestFocus() with (MaterialAlertDialogBuilder(this, R.style.AlertDialogTheme)) { setView(layout) - setPositiveButton(android.R.string.ok) { dialog, _ -> imm.hideSoftInputFromWindow(input.windowToken, 0) dialog.dismiss()