filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Confirm identity server disconnection in all cases, as Riot-Web does

This commit is contained in:
Benoit Marty 2020-05-11 14:11:07 +02:00
parent 4b2f8e9174
commit 84a3754c9f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt
View File

@ -158,17 +158,18 @@ class DiscoverySettingsFragment @Inject constructor(
val pidList = state.emailList().orEmpty() + state.phoneNumbersList().orEmpty() val pidList = state.emailList().orEmpty() + state.phoneNumbersList().orEmpty()
val hasBoundIds = pidList.any { it.isShared() == SharedState.SHARED } val hasBoundIds = pidList.any { it.isShared() == SharedState.SHARED }
if (hasBoundIds) { val message = if (hasBoundIds) {
// we should prompt getString(R.string.settings_discovery_disconnect_with_bound_pid, state.identityServer(), state.identityServer())
} else {
getString(R.string.disconnect_identity_server_dialog_content, state.identityServer())
}
AlertDialog.Builder(requireActivity()) AlertDialog.Builder(requireActivity())
.setTitle(R.string.disconnect_identity_server) .setTitle(R.string.disconnect_identity_server)
.setMessage(getString(R.string.settings_discovery_disconnect_with_bound_pid, state.identityServer(), state.identityServer())) .setMessage(message)
.setPositiveButton(R.string._continue) { _, _ -> viewModel.handle(DiscoverySettingsAction.ChangeIdentityServer(null)) } .setPositiveButton(R.string.disconnect) { _, _ -> viewModel.handle(DiscoverySettingsAction.ChangeIdentityServer(null)) }
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show() .show()
} else {
viewModel.handle(DiscoverySettingsAction.ChangeIdentityServer(null))
}
} }
} }

1
vector/src/main/res/values/strings.xml
View File

@ -2404,4 +2404,5 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
<string name="choose_locale_loading_locales">Loading available languages…</string> <string name="choose_locale_loading_locales">Loading available languages…</string>
<string name="open_terms_of">Open terms of %s</string> <string name="open_terms_of">Open terms of %s</string>
<string name="disconnect_identity_server_dialog_content">Disconnect from the identity server %s?</string>
</resources> </resources>