capture device info message (in case of nopermissions)

hoangphuc79 · Feb 1, 2019 · 1cc96fc · 1cc96fc
1 parent 8f60bb3
commit 1cc96fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/SharpAdbClient.Tests/DeviceDataTests.cs b/SharpAdbClient.Tests/DeviceDataTests.cs
@@ -31,6 +31,7 @@ public void CreateFromDeviceNoPermissionTest2()
             Assert.Equal(string.Empty, device.Name);
             Assert.Equal(string.Empty, device.Features);
             Assert.Equal<DeviceState>(DeviceState.NoPermissions, device.State);
+            Assert.Equal(" (user in plugdev group; are your udev rules wrong?); see [http://developer.android.com/tools/device.html", device.Message);
             Assert.Equal(string.Empty, device.Usb);
             Assert.Equal(string.Empty, device.TransportId);
         }

diff --git a/SharpAdbClient/DeviceData.cs b/SharpAdbClient/DeviceData.cs
@@ -16,7 +16,7 @@ public class DeviceData
         /// A regular expression that can be used to parse the device information that is returned
         /// by the Android Debut Bridge.
         /// </summary>
-        internal const string DeviceDataRegexString = @"^(?<serial>[a-zA-Z0-9_-]+(?:\s?[\.a-zA-Z0-9_-]+)?(?:\:\d{1,})?)\s+(?<state>device|connecting|offline|unknown|bootloader|recovery|download|authorizing|unauthorized|host|no permissions)(.*?)(\s+usb:(?<usb>[^:]+))?(?:\s+product:(?<product>[^:]+))?(\s+model\:(?<model>[\S]+))?(\s+device\:(?<device>[\S]+))?(\s+features:(?<features>[^:]+))?(\s+transport_id:(?<transport_id>[^:]+))?$";
+        internal const string DeviceDataRegexString = @"^(?<serial>[a-zA-Z0-9_-]+(?:\s?[\.a-zA-Z0-9_-]+)?(?:\:\d{1,})?)\s+(?<state>device|connecting|offline|unknown|bootloader|recovery|download|authorizing|unauthorized|host|no permissions)(?<message>.*?)(\s+usb:(?<usb>[^:]+))?(?:\s+product:(?<product>[^:]+))?(\s+model\:(?<model>[\S]+))?(\s+device\:(?<device>[\S]+))?(\s+features:(?<features>[^:]+))?(\s+transport_id:(?<transport_id>[^:]+))?$";
 
         /// <summary>
         /// A regular expression that can be used to parse the device information that is returned
@@ -96,6 +96,15 @@ public string TransportId
             set;
         }
 
+        /// <summary>
+        /// Gets or sets the device info message. Currently only seen for NoPermissions state.
+        /// </summary>
+        public string Message
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// Creates a new instance of the <see cref="DeviceData"/> class based on
         /// data retrieved from the Android Debug Bridge.
@@ -120,7 +129,8 @@ public static DeviceData CreateFromAdbData(string data)
                     Name = m.Groups["device"].Value,
                     Features = m.Groups["features"].Value,
                     Usb = m.Groups["usb"].Value,
-                    TransportId = m.Groups["transport_id"].Value
+                    TransportId = m.Groups["transport_id"].Value,
+                    Message = m.Groups["message"].Value
                 };
             }
             else