Commit 065774ef authored by Toni Beier's avatar Toni Beier

Merge branch 'detect_empty_user_identity' into 'master'

Detect empty user identity

See merge request !18
parents f351e1b1 6881ea0a
Pipeline #24313 passed with stages
in 6 minutes and 37 seconds
......@@ -609,16 +609,22 @@ class Helper {
else if (currentConfig.allowedGroupCiphers.toString().contains("2")) message+=" with TKIP";
list.add(new MainActivity.TickLine(ticked, message, "SSID", false));
ticked = false;
message = currentConfig.enterpriseConfig.getIdentity();
if( message.contains("@") ) {
message = message.substring(0, message.indexOf('@'));
if( message.contains("-") ) {
message = message.substring(0, message.indexOf('-'));
if( message != null && !message.isEmpty() ) {
if (message.contains("@")) {
message = message.substring(0, message.indexOf('@'));
if (message.contains("-")) {
message = message.substring(0, message.indexOf('-'));
ticked = true;
}
}
} else {
message = context.getString(R.string.tickline_subtext_user_identity_not_found);
ticked = false;
}
ticked = true;
list.add(new MainActivity.TickLine(ticked, message, "User Identität", false));
list.add(new MainActivity.TickLine(ticked, message, context.getString(R.string.tickline_message_user_identity), false));
if (currentConfig.enterpriseConfig.getAnonymousIdentity().length()>0) {
String anonymousIdentity = currentConfig.enterpriseConfig.getAnonymousIdentity();
......
......@@ -19,6 +19,8 @@
<string name="tickline_subtext_ca_cert_certificate_ok">OK</string>
<string name="tickline_subtext_ca_cert_certificate_not_found">Zertifikat nicht gefunden</string>
<string name="tickline_subtext_ca_cert_certificate_wrong">Falsches Zertifikat</string>
<string name="tickline_subtext_user_identity_not_found">Nicht vorhanden</string>
<string name="tickline_message_user_identity">User Identität</string>
<plurals name="connect_to_internet_message">
<item quantity="one">Bitte stelle eine Internetverbindung mit einem WLAN oder über mobile Daten her.\nIn der TU Chemnitz kannst du das WLAN Netz %1$s verwenden.</item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment