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 custom_prefix
No related tags found
No related merge requests found
Pipeline #298 passed
[*] [*]
charset=utf-8 charset=utf-8
end_of_line=lf 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_style=space
indent_size=2 indent_size=2
...@@ -9,6 +17,10 @@ indent_size=2 ...@@ -9,6 +17,10 @@ indent_size=2
indent_style=space indent_style=space
indent_size=2 indent_size=2
[*.java]
indent_style=space
indent_size=2
[{*.kts,*.kt}] [{*.kts,*.kt}]
indent_style=space indent_style=space
indent_size=2 indent_size=2
......
...@@ -73,14 +73,14 @@ class UserSetupActivity : ServiceBoundSetupActivity() { ...@@ -73,14 +73,14 @@ class UserSetupActivity : ServiceBoundSetupActivity() {
), data.getStringArray("channels")?.toList().orEmpty()) ), data.getStringArray("channels")?.toList().orEmpty())
backend.requestConnectNewNetwork() backend.requestConnectNewNetwork()
setResult(Activity.RESULT_OK)
finish()
} }
}) })
} }
} }
} }
setResult(Activity.RESULT_OK)
finish()
} }
override val fragments = listOf( override val fragments = listOf(
......
...@@ -174,6 +174,15 @@ class UserSetupNetworkSlide : SlideFragment() { ...@@ -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 return view
} }
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<string name="label_account_name">Accountname</string> <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 --> <!-- Core Authenticator Select -->
<string name="slide_core_authenticator_select_title">Authentifizierungsbackend auswählen</string> <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