Fix crash when opening Identity Server detail from preference

Author: bmarty

vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt

@@ -176,15 +176,19 @@ class VectorSettingsGeneralFragment @Inject constructor(
             mPasswordPreference.isVisible = false
         }
 
-        val discoveryPreference = findPreference<VectorPreference>(VectorPreferences.SETTINGS_DISCOVERY_PREFERENCE_KEY)!!
-        discoveryPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+        val openDiscoveryScreenPreferenceClickListener = Preference.OnPreferenceClickListener {
             (requireActivity() as VectorSettingsActivity).navigateTo(
                     DiscoverySettingsFragment::class.java,
                     SettingsActivityPayload.DiscoverySettings().toMvRxBundle()
             )
             true
         }
 
+        val discoveryPreference = findPreference<VectorPreference>(VectorPreferences.SETTINGS_DISCOVERY_PREFERENCE_KEY)!!
+        discoveryPreference.onPreferenceClickListener = openDiscoveryScreenPreferenceClickListener
+
+        mIdentityServerPreference.onPreferenceClickListener = openDiscoveryScreenPreferenceClickListener
+
         // Advanced settings
 
         // user account

vector/src/main/res/xml/vector_settings_general.xml

@@ -87,7 +87,6 @@
         <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_identity_server"
-            app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment"
             tools:summary="https://identity.server.url" />
 
         <im.vector.app.core.preference.VectorPreference