diff --git a/app/src/full/java/com/celzero/bravedns/adapter/CustomDomainAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/CustomDomainAdapter.kt index ec45b00b6..81720a1fb 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/CustomDomainAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/CustomDomainAdapter.kt @@ -295,7 +295,6 @@ class CustomDomainAdapter(val context: Context, val rule: CustomRulesActivity.RU lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() dialog.setCancelable(true) - dialog.setCanceledOnTouchOutside(true) dialog.window?.attributes = lp dBind.dacdUrlTitle.text = context.getString(R.string.cd_dialog_title) diff --git a/app/src/full/java/com/celzero/bravedns/adapter/CustomIpAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/CustomIpAdapter.kt index 43f29b127..538cd7280 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/CustomIpAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/CustomIpAdapter.kt @@ -717,8 +717,7 @@ class CustomIpAdapter(private val context: Context, private val type: CustomRule lp.width = WindowManager.LayoutParams.MATCH_PARENT lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() - dialog.setCancelable(false) - dialog.setCanceledOnTouchOutside(false) + dialog.setCancelable(true) dialog.window?.attributes = lp dBind.daciIpTitle.text = context.getString(R.string.ci_dialog_title) diff --git a/app/src/full/java/com/celzero/bravedns/ui/fragment/CustomDomainFragment.kt b/app/src/full/java/com/celzero/bravedns/ui/fragment/CustomDomainFragment.kt index f6d4e96e3..bad424f4f 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/fragment/CustomDomainFragment.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/fragment/CustomDomainFragment.kt @@ -223,8 +223,7 @@ class CustomDomainFragment : lp.width = WindowManager.LayoutParams.MATCH_PARENT lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() - dialog.setCancelable(false) - dialog.setCanceledOnTouchOutside(false) + dialog.setCancelable(true) dialog.window?.attributes = lp dBind.dacdUrlTitle.text = getString(R.string.cd_dialog_title) diff --git a/app/src/full/java/com/celzero/bravedns/ui/fragment/CustomIpFragment.kt b/app/src/full/java/com/celzero/bravedns/ui/fragment/CustomIpFragment.kt index 3a27cb602..2ec19c568 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/fragment/CustomIpFragment.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/fragment/CustomIpFragment.kt @@ -192,8 +192,7 @@ class CustomIpFragment : Fragment(R.layout.fragment_custom_ip), SearchView.OnQue lp.width = WindowManager.LayoutParams.MATCH_PARENT lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() - dialog.setCancelable(false) - dialog.setCanceledOnTouchOutside(false) + dialog.setCancelable(true) dialog.window?.attributes = lp dBind.daciIpTitle.text = getString(R.string.ci_dialog_title) diff --git a/app/src/full/java/com/celzero/bravedns/ui/fragment/DnsCryptListFragment.kt b/app/src/full/java/com/celzero/bravedns/ui/fragment/DnsCryptListFragment.kt index 6a7afdcba..2bb13e57c 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/fragment/DnsCryptListFragment.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/fragment/DnsCryptListFragment.kt @@ -120,8 +120,7 @@ class DnsCryptListFragment : Fragment(R.layout.fragment_dns_crypt_list) { lp.width = WindowManager.LayoutParams.MATCH_PARENT lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() - dialog.setCancelable(false) - dialog.setCanceledOnTouchOutside(false) + dialog.setCancelable(true) dialog.window?.attributes = lp val radioServer = dialogBinding.dialogDnsCryptRadioServer diff --git a/app/src/full/java/com/celzero/bravedns/ui/fragment/DnsProxyListFragment.kt b/app/src/full/java/com/celzero/bravedns/ui/fragment/DnsProxyListFragment.kt index 6bced4765..478fff75b 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/fragment/DnsProxyListFragment.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/fragment/DnsProxyListFragment.kt @@ -95,8 +95,7 @@ class DnsProxyListFragment : Fragment(R.layout.fragment_dns_proxy_list) { lp.width = WindowManager.LayoutParams.MATCH_PARENT lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() - dialog.setCancelable(false) - dialog.setCanceledOnTouchOutside(false) + dialog.setCancelable(true) // TODO: figure out why window maybe null dialog.window?.attributes = lp diff --git a/app/src/full/java/com/celzero/bravedns/ui/fragment/DoTListFragment.kt b/app/src/full/java/com/celzero/bravedns/ui/fragment/DoTListFragment.kt index 08ffbed0b..8eb603006 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/fragment/DoTListFragment.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/fragment/DoTListFragment.kt @@ -86,8 +86,7 @@ class DoTListFragment : Fragment(R.layout.fragment_dot_list) { lp.width = WindowManager.LayoutParams.MATCH_PARENT lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() - dialog.setCancelable(false) - dialog.setCanceledOnTouchOutside(false) + dialog.setCancelable(true) dialog.window?.attributes = lp val heading = dialogBinding.dialogCustomUrlTop diff --git a/app/src/full/java/com/celzero/bravedns/ui/fragment/DohListFragment.kt b/app/src/full/java/com/celzero/bravedns/ui/fragment/DohListFragment.kt index 2519f2080..d298305c3 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/fragment/DohListFragment.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/fragment/DohListFragment.kt @@ -94,8 +94,7 @@ class DohListFragment : Fragment(R.layout.fragment_doh_list) { lp.width = WindowManager.LayoutParams.MATCH_PARENT lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() - dialog.setCancelable(false) - dialog.setCanceledOnTouchOutside(false) + dialog.setCancelable(true) dialog.window?.attributes = lp val applyURLBtn = dialogBinding.dialogCustomUrlOkBtn diff --git a/app/src/full/java/com/celzero/bravedns/ui/fragment/ODoHListFragment.kt b/app/src/full/java/com/celzero/bravedns/ui/fragment/ODoHListFragment.kt index bf3fda08e..9f436ff11 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/fragment/ODoHListFragment.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/fragment/ODoHListFragment.kt @@ -88,8 +88,7 @@ class ODoHListFragment : Fragment(R.layout.fragment_odoh_list) { lp.width = WindowManager.LayoutParams.MATCH_PARENT lp.height = WindowManager.LayoutParams.WRAP_CONTENT dialog.show() - dialog.setCancelable(false) - dialog.setCanceledOnTouchOutside(false) + dialog.setCancelable(true) dialog.window?.attributes = lp val heading = dialogBinding.dialogCustomUrlTop