Skip to content

Commit 9ef80be

Browse files
committed
Add judgment for DumpScreenAsync #55
1 parent 5922fd9 commit 9ef80be

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

AdvancedSharpAdbClient/AdbClient.Async.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,9 @@ public async Task<XmlDocument> DumpScreenAsync(DeviceData device, CancellationTo
696696
string xmlString = await Utilities.Run(reader.ReadToEnd, cancellationToken).ConfigureAwait(false);
697697
#endif
698698
xmlString = xmlString.Replace("Events injected: 1\r\n", "").Replace("UI hierchary dumped to: /dev/tty", "").Trim();
699-
if (xmlString != "" && !xmlString.StartsWith("ERROR"))
699+
if (!string.IsNullOrEmpty(xmlString)
700+
&& !xmlString.StartsWith("ERROR")
701+
&& !xmlString.StartsWith("java.lang.Exception"))
700702
{
701703
doc.LoadXml(xmlString);
702704
return doc;

AdvancedSharpAdbClient/AdbClient.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,9 @@ public XmlDocument DumpScreen(DeviceData device)
657657
AdbResponse response = socket.ReadAdbResponse();
658658
using StreamReader reader = new(socket.GetShellStream(), Encoding);
659659
string xmlString = reader.ReadToEnd().Replace("Events injected: 1\r\n", "").Replace("UI hierchary dumped to: /dev/tty", "").Trim();
660-
if (xmlString != "" && !xmlString.StartsWith("ERROR"))
660+
if (!string.IsNullOrEmpty(xmlString)
661+
&& !xmlString.StartsWith("ERROR")
662+
&& !xmlString.StartsWith("java.lang.Exception"))
661663
{
662664
doc.LoadXml(xmlString);
663665
return doc;

0 commit comments

Comments
 (0)