demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Proposition of fix for issue #13722 (#19660)

Browse Source 
Signed-off-by: gael@lhopital.org <gael@lhopital.org>
This commit is contained in:
Gaël L'hopital
2025-11-17 18:34:02 +01:00
committed by GitHub
parent 41d2a716d2
commit 66049364fc
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java
+9 -7
View File
@@ -211,12 +211,14 @@ public class AndroidDebugBridgeDevice {
} else {
out = runAdbShell("dumpsys", "window", "windows", "|", "grep", "mFocusedApp");
}
var targetLine = Arrays.stream(out.split("\n")).findFirst().orElse("");
var lineParts = targetLine.split(" ");
if (lineParts.length >= 2) {
var packageActivityName = lineParts[lineParts.length - 2];
if (packageActivityName.contains("/")) {
return packageActivityName.split("/")[0];
if (Arrays.stream(out.split("\n")).findFirst().orElse("") instanceof String targetLine) {
var lineParts = targetLine.split(" ");
if (lineParts.length >= 2) {
var packageActivityName = lineParts[lineParts.length - 2];
if (packageActivityName.contains("/")) {
return packageActivityName.split("/")[0];
}
}
}
throw new AndroidDebugBridgeDeviceReadException("Unable to read package name");
@@ -760,7 +762,7 @@ public class AndroidDebugBridgeDevice {
do {
byteArrayOutputStream.writeBytes(stream.read());
} while (!stream.isClosed());
} catch (IOException e) {
} catch (IllegalStateException | IOException e) {
if (!"Stream closed".equals(e.getMessage())) {
throw e;
}