Skip to content
Snippets Groups Projects
Verified Commit dbb6c3f5 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Minor bugfixes for network creation UI

parent 87204874
Branches
No related tags found
No related merge requests found
Pipeline #298 passed
[*]
charset=utf-8
end_of_line=lf
insert_final_newline=false
insert_final_newline=true
indent_style=space
indent_size=4
[{*.mod,*.dtd,*.ent,*.elt}]
indent_style=space
indent_size=2
[{*.jhm,*.rng,*.wsdl,*.fxml,*.xslt,*.jrxml,*.ant,*.xul,*.xsl,*.xsd,*.tld,*.jnlp,*.xml}]
indent_style=space
indent_size=2
......@@ -9,6 +17,10 @@ indent_size=2
indent_style=space
indent_size=2
[*.java]
indent_style=space
indent_size=2
[{*.kts,*.kt}]
indent_style=space
indent_size=2
......
......@@ -43,44 +43,44 @@ class UserSetupActivity : ServiceBoundSetupActivity() {
}
override fun onDone(data: Bundle) {
val network = data.getSerializable("network") as? DefaultNetwork
if (network != null) {
viewModel.backend?.value?.ifPresent { backend ->
viewModel.session.value?.orNull()?.rpcHandler?.apply {
createIdentity(Defaults.identity(this@UserSetupActivity).apply {
setIdentityName(this@UserSetupActivity.getString(R.string.default_identity_identity_name))
setNicks(listOf(data.getString("nick")))
setRealName(data.getString("realname"))
}, emptyMap())
val network = data.getSerializable("network") as? DefaultNetwork
if (network != null) {
viewModel.backend?.value?.ifPresent { backend ->
viewModel.session.value?.orNull()?.rpcHandler?.apply {
createIdentity(Defaults.identity(this@UserSetupActivity).apply {
setIdentityName(this@UserSetupActivity.getString(R.string.default_identity_identity_name))
setNicks(listOf(data.getString("nick")))
setRealName(data.getString("realname"))
}, emptyMap())
viewModel.identities
.map(Map<IdentityId, Identity>::values)
.filter(Collection<Identity>::isNotEmpty)
.map(Collection<Identity>::first)
.firstElement()
.toLiveData().observe(this@UserSetupActivity, Observer {
if (it != null) {
createNetwork(INetwork.NetworkInfo(
networkName = network.name,
identity = it.id(),
serverList = network.servers.map {
INetwork.Server(
host = it.host,
port = it.port,
useSsl = it.secure
)
}
), data.getStringArray("channels")?.toList().orEmpty())
viewModel.identities
.map(Map<IdentityId, Identity>::values)
.filter(Collection<Identity>::isNotEmpty)
.map(Collection<Identity>::first)
.firstElement()
.toLiveData().observe(this@UserSetupActivity, Observer {
if (it != null) {
createNetwork(INetwork.NetworkInfo(
networkName = network.name,
identity = it.id(),
serverList = network.servers.map {
INetwork.Server(
host = it.host,
port = it.port,
useSsl = it.secure
)
}
), data.getStringArray("channels")?.toList().orEmpty())
backend.requestConnectNewNetwork()
setResult(Activity.RESULT_OK)
finish()
}
})
}
backend.requestConnectNewNetwork()
}
})
}
}
}
setResult(Activity.RESULT_OK)
finish()
}
override val fragments = listOf(
......
......@@ -174,6 +174,15 @@ class UserSetupNetworkSlide : SlideFragment() {
}
}
sslEnabled.setOnCheckedChangeListener { _, isChecked ->
val portValue = portField.text.trim().toString()
if (isChecked && portValue == "6667") {
portField.setText("6697")
} else if (!isChecked && portValue == "6697") {
portField.setText("6667")
}
}
return view
}
......
......@@ -48,7 +48,7 @@
<string name="label_account_name">Accountname</string>
<string name="hint_invalid_name">Accountname darf nicht leer sein</string>
<string name="hint_invalid_name">Name darf nicht leer sein</string>
<!-- Core Authenticator Select -->
<string name="slide_core_authenticator_select_title">Authentifizierungsbackend auswählen</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment