Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed null in wi-fi frontend and missing wi-fi update on IPv6 [backport release-5.5.0] #5292

Merged
merged 1 commit into from
Jun 24, 2024
Merged

fix: fixed null in wi-fi frontend and missing wi-fi update on IPv6 [backport release-5.5.0] #5292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ...eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,16 +1322,16 @@ private void setPasswordValidation() {
configUserOptions.allowAnyPassword();
}

if (this.security.getSelectedItemText().equals(WIFI_SECURITY_WPA_MESSAGE)
if (this.security != null && (this.security.getSelectedItemText().equals(WIFI_SECURITY_WPA_MESSAGE)
|| this.security.getSelectedItemText().equals(WIFI_SECURITY_WPA2_MESSAGE)
|| this.security.getSelectedItemText().contentEquals(WIFI_SECURITY_WPA_WPA2_MESSAGE)) {
|| this.security.getSelectedItemText().contentEquals(WIFI_SECURITY_WPA_WPA2_MESSAGE))) {

this.password.setValidatorsFrom(configUserOptions);
configUserOptions.setPasswordMinimumLength(Math.min(configUserOptions.getPasswordMinimumLength(), 63));

this.password.addValidator(GwtValidators.regex(REGEX_PASS_WPA, MSGS.netWifiWirelessInvalidWPAPassword()));

} else if (this.security.getSelectedItemText().equals(WIFI_SECURITY_WEP_MESSAGE)) {
} else if (this.security != null && this.security.getSelectedItemText().equals(WIFI_SECURITY_WEP_MESSAGE)) {

configUserOptions.setPasswordRequireSpecialChars(false);
configUserOptions.setPasswordMinimumLength(Math.min(configUserOptions.getPasswordMinimumLength(), 26));
Expand Down Expand Up @@ -1741,14 +1741,14 @@ private void setForm(boolean visible) {
private boolean checkPassword() {
boolean result = true;

if (!this.password.validate() && this.password.isEnabled()) {
if (this.password != null && !this.password.validate() && this.password.isEnabled()) {
this.groupPassword.setValidationState(ValidationState.ERROR);
result = false;
} else {
this.groupPassword.setValidationState(ValidationState.NONE);
}

if (this.verify.isEnabled() && TabWirelessUi.this.password != null
if (this.verify != null && this.verify.isEnabled() && TabWirelessUi.this.password != null
&& !TabWirelessUi.this.verify.getText().equals(TabWirelessUi.this.password.getText())) {
TabWirelessUi.this.helpVerify.setText(MSGS.netWifiWirelessPasswordDoesNotMatch());
TabWirelessUi.this.groupVerify.setValidationState(ValidationState.ERROR);
Expand Down Expand Up @@ -1820,7 +1820,8 @@ private void updateChannelListValues(List<GwtWifiChannelFrequency> freqChannels)
addAutomaticChannel(freqChannels);
freqChannels.stream().forEach(this::addItemChannelList);

if (this.activeConfig.getChannels() != null && !this.activeConfig.getChannels().isEmpty()) {
if (this.activeConfig != null && this.activeConfig.getChannels() != null
&& !this.activeConfig.getChannels().isEmpty()) {
this.netTabs.hardwareTab.channel
.setText(this.channelList.getItemText(this.activeConfig.getChannels().get(0)));

Expand Down Expand Up @@ -1880,7 +1881,7 @@ public void onSuccess(Boolean acSupported) {

if (selectedRadioMode != null) {
setRadioModeByValue(selectedRadioMode);
} else {
} else if (TabWirelessUi.this.activeConfig != null) {
setRadioModeByValue(TabWirelessUi.this.activeConfig.getRadioMode());
}

Expand Down
20 changes: 12 additions & 8 deletions ...ipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,10 @@ public Map<String, Object> build() throws GwtKuraException {
setIpv4DhcpServerProperties();
set8021xConfig();

switch (this.gwtConfig.getStatusEnum()) {
case netIPv4StatusDisabled:
break;
case netIPv4StatusUnmanaged:
break;
default:
if (isIPv4StatusEnabledManaged(this.gwtConfig.getStatus())
|| isIPv6StatusEnabledManaged(this.gwtConfig.getIpv6Status())) {
setWifiProperties();
setModemProperties();
break;
}

// Manage GPS independently of device ip status
Expand All @@ -83,6 +78,15 @@ public Map<String, Object> build() throws GwtKuraException {
return this.properties.getProperties();
}

private boolean isIPv4StatusEnabledManaged(String ipv4Status) {
return !(ipv4Status.equals(GwtNetIfStatus.netIPv4StatusDisabled.name())
|| ipv4Status.equals(GwtNetIfStatus.netIPv4StatusUnmanaged.name()));
}

private boolean isIPv6StatusEnabledManaged(String ipv6Status) {
return !ipv6Status.equals(GwtNetIfStatus.netIPv6StatusDisabled.name());
}

private void setCommonProperties() {
this.properties.setType(this.ifname, this.gwtConfig.getHwType());

Expand Down Expand Up @@ -427,7 +431,7 @@ private void setAdvancedProperties() {
this.properties.setIp6Mtu(this.ifname,
Objects.nonNull(this.gwtConfig.getIpv6Mtu()) ? this.gwtConfig.getIpv6Mtu() : DEFAULT_MTU);
this.properties.setPromisc(this.ifname,
Objects.nonNull(this.gwtConfig.getPromisc()) ? this.gwtConfig.getPromisc() : DEFAULT_PROMISC);
Objects.nonNull(this.gwtConfig.getPromisc()) ? this.gwtConfig.getPromisc() : DEFAULT_PROMISC);
}

private static GwtNetInterfaceConfig getConfigsAndStatuses(String ifName) throws GwtKuraException, KuraException {
Expand Down
Loading