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

Jump to bottom

[airq] StringIndexOutOfBoundsException on empty usercalib #14000

Merged
merged 10 commits into from
Dec 18, 2022
Merged

[airq] StringIndexOutOfBoundsException on empty usercalib #14000

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
70da552
Merge pull request #1 from openhab/main
MikeTheTux Mar 27, 2021
9fdfd26
Merge branch 'openhab:main' into main
MikeTheTux Jul 11, 2021
8fdf5b9
Merge branch 'openhab:main' into main
MikeTheTux Nov 5, 2021
218bdbd
Merge branch 'openhab:main' into main
MikeTheTux Nov 17, 2021
5d9bd1b
Merge branch 'openhab:main' into main
MikeTheTux Dec 29, 2021
e9887c3
Merge branch 'openhab:main' into main
MikeTheTux Jan 9, 2022
72b7c2f
Merge branch 'openhab:main' into main
MikeTheTux Jan 28, 2022
5b8a42b
Merge branch 'openhab:main' into main
MikeTheTux Oct 8, 2022
0c2e6c5
Merge branch 'openhab:main' into main
MikeTheTux Dec 17, 2022
b91f201
fixed potential StringIndexOutOfBoundsExceptions
MikeTheTux Dec 18, 2022
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
30 changes: 23 additions & 7 deletions ...org.openhab.binding.airq/src/main/java/org/openhab/binding/airq/internal/AirqHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
break;
case "logLevel":
String ll = command.toString();
if (ll.equals("Error") || ll.equals("Warning") || ll.equals("Info")) {
if ("Error".equals(ll) || "Warning".equals(ll) || "Info".equals(ll)) {
newobj.addProperty("logging", ll);
changeSettings(newobj);
} else {
Expand All @@ -288,7 +288,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
break;
case "powerFreqSuppression":
String newFreq = command.toString();
if (newFreq.equals("50Hz") || newFreq.equals("60Hz") || newFreq.equals("50Hz+60Hz")) {
if ("50Hz".equals(newFreq) || "60Hz".equals(newFreq) || "50Hz+60Hz".equals(newFreq)) {
newobj.addProperty("Rejection", newFreq);
changeSettings(newobj);
} else {
Expand Down Expand Up @@ -710,7 +710,12 @@ private void processType(JsonObject dec, String airqName, String channelName, St
for (JsonElement el : arr) {
str.append(el.getAsString() + ", ");
}
updateState(channelName, new StringType(str.substring(0, str.length() - 2)));
if (str.length() >= 2) {
updateState(channelName, new StringType(str.substring(0, str.length() - 2)));
} else {
logger.trace("air-Q - airqHandler - processType(): cannot handle this as an array: {}",
jsonarr);
}
} else {
logger.warn("air-Q - airqHandler - processType(): cannot handle this as an array: {}", jsonarr);
}
Expand All @@ -730,7 +735,13 @@ private void processType(JsonObject dec, String airqName, String channelName, St
str = str + attributeName + ": offset=" + attributeValue.get("offset").getAsString() + " ["
+ timecalibString + "]";
}
updateState(channelName, new StringType(str.substring(0, str.length() - 1)));
if (!str.isEmpty()) {
updateState(channelName, new StringType(str.substring(0, str.length() - 1)));
} else {
logger.trace(
"air-Q - airqHandler - processType(): Cannot extract calibration data from this string: {}",
dec.get(airqName).toString());
}
} else {
logger.warn(
"air-Q - airqHandler - processType(): Cannot extract calibration data from this string: {}",
Expand All @@ -749,9 +760,14 @@ private void processType(JsonObject dec, String airqName, String channelName, St
for (JsonElement el : arr) {
arrstr = arrstr + el.getAsString() + ", ";
}
logger.trace("air-Q - airqHandler - processType(): property array {} set to {}", channelName,
arrstr.substring(0, arrstr.length() - 2));
getThing().setProperty(channelName, arrstr.substring(0, arrstr.length() - 2));
if (arrstr.length() >= 2) {
logger.trace("air-Q - airqHandler - processType(): property array {} set to {}",
channelName, arrstr.substring(0, arrstr.length() - 2));
getThing().setProperty(channelName, arrstr.substring(0, arrstr.length() - 2));
} else {
logger.trace("air-Q - airqHandler - processType(): cannot handle this as an array: {}",
proparr);
}
} else {
logger.warn("air-Q - airqHandler - processType(): cannot handle this as an array: {}", proparr);
}
Expand Down