From f340a19c8e36fd4e22b428f6b95838e28f9bcd2d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 8 Dec 2021 16:30:45 +0100 Subject: [PATCH] Fix issue in disconnect identity server confirmation dialog content --- .../app/features/discovery/DiscoverySettingsFragment.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt index 9c46fc2089..e1e1c9a537 100644 --- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt @@ -167,10 +167,11 @@ class DiscoverySettingsFragment @Inject constructor( val pidList = state.emailList().orEmpty() + state.phoneNumbersList().orEmpty() val hasBoundIds = pidList.any { it.isShared() == SharedState.SHARED } + val serverUrl = state.identityServer()?.serverUrl.orEmpty() val message = if (hasBoundIds) { - getString(R.string.settings_discovery_disconnect_with_bound_pid, state.identityServer(), state.identityServer()) + getString(R.string.settings_discovery_disconnect_with_bound_pid, serverUrl, serverUrl) } else { - getString(R.string.disconnect_identity_server_dialog_content, state.identityServer()) + getString(R.string.disconnect_identity_server_dialog_content, serverUrl) } MaterialAlertDialogBuilder(requireActivity())