Commit 6b6908e3 authored by Toni Beier's avatar Toni Beier

Merge branch 'hide_critical_information' into 'master'

Hide critical information

See merge request !8
parents ef0332c2 5c1e4637
Pipeline #21753 passed with stages
in 3 minutes and 20 seconds
......@@ -588,12 +588,17 @@ class Helper {
else if (currentConfig.allowedGroupCiphers.toString().contains("2")) message+=" with TKIP";
list.add(new MainActivity.TickLine(ticked, message, "SSID", false));
message = currentConfig.enterpriseConfig.getIdentity();
if( message.contains("@") ) {
message = message.substring(0, message.indexOf('@'));
if( message.contains("-") ) {
message = message.substring(0, message.indexOf('-'));
}
}
message=currentConfig.enterpriseConfig.getIdentity();
ticked = true;
list.add(new MainActivity.TickLine(ticked, message, "User Identität", false));
if (currentConfig.enterpriseConfig.getAnonymousIdentity().length()>0) {
String anonymousIdentity = currentConfig.enterpriseConfig.getAnonymousIdentity();
if (!anonymousIdentity.equals(context.getString(R.string.edurom_anonymous_identity))) {
......@@ -661,7 +666,7 @@ class Helper {
if (subjectMatch!=null && subjectMatch.length()>0)
{
message=subjectMatch;
message=context.getString(R.string.tickline_message_server_subject_match_ok);
ticked = true;
}
else {
......
......@@ -7,4 +7,6 @@
<string translatable="false" name="edurom_identity_pattern">%1$s-%2$s@tu-chemnitz.de</string>
<string name="tickline_category_app_version">App Version</string>
<string name="tickline_message_server_subject_match_ok">OK</string>
</resources>
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