Add judgment for DumpScreenAsync #55

SharpAdb · May 26, 2023 · ee93161 · ee93161
1 parent 2ca692b
commit ee93161
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/AdvancedSharpAdbClient/AdbClient.Async.cs b/AdvancedSharpAdbClient/AdbClient.Async.cs
@@ -696,7 +696,9 @@ public async Task<XmlDocument> DumpScreenAsync(DeviceData device, CancellationTo
             string xmlString = await Utilities.Run(reader.ReadToEnd, cancellationToken).ConfigureAwait(false);
 #endif
             xmlString = xmlString.Replace("Events injected: 1\r\n", "").Replace("UI hierchary dumped to: /dev/tty", "").Trim();
-            if (xmlString != "" && !xmlString.StartsWith("ERROR"))
+            if (!string.IsNullOrEmpty(xmlString)
+                && !xmlString.StartsWith("ERROR")
+                && !xmlString.StartsWith("java.lang.Exception"))
             {
                 doc.LoadXml(xmlString);
                 return doc;

diff --git a/AdvancedSharpAdbClient/AdbClient.cs b/AdvancedSharpAdbClient/AdbClient.cs
@@ -657,7 +657,9 @@ public XmlDocument DumpScreen(DeviceData device)
             AdbResponse response = socket.ReadAdbResponse();
             using StreamReader reader = new(socket.GetShellStream(), Encoding);
             string xmlString = reader.ReadToEnd().Replace("Events injected: 1\r\n", "").Replace("UI hierchary dumped to: /dev/tty", "").Trim();
-            if (xmlString != "" && !xmlString.StartsWith("ERROR"))
+            if (!string.IsNullOrEmpty(xmlString)
+                && !xmlString.StartsWith("ERROR")
+                && !xmlString.StartsWith("java.lang.Exception"))
             {
                 doc.LoadXml(xmlString);
                 return doc;