Change default encoding to UTF-8, Fix incomplete reads in SyncService

SharpAdbClient/AdbClient.cs

@@ -39,7 +39,7 @@ public class AdbClient : IAdbClient
         /// <summary>
         /// The default encoding
         /// </summary>
-        public const string DefaultEncoding = "ISO-8859-1";
+        public const string DefaultEncoding = "UTF-8";
 
         /// <summary>
         /// The port at which the Android Debug Bridge server listens by default.

SharpAdbClient/AdbSocket.cs

@@ -145,9 +145,9 @@ public virtual void SendSyncRequest(SyncCommand command, string path)
                 throw new ArgumentNullException(nameof(path));
             }
 
-            this.SendSyncRequest(command, path.Length);
-
             byte[] pathBytes = AdbClient.Encoding.GetBytes(path);
+            this.SendSyncRequest(command, pathBytes.Length);
+
             this.Write(pathBytes);
         }
 

SharpAdbClient/SyncService.cs

@@ -211,10 +211,13 @@ public void Push(Stream stream, string remotePath, int permissions, DateTimeOffs
             if (result == SyncCommand.FAIL)
             {
                 var message = this.Socket.ReadSyncString();
-
                 throw new AdbException(message);
             }
-            else if (result != SyncCommand.OKAY)
+            else if (result == SyncCommand.OKAY)
+            {
+                this.Socket.ReadSyncString();
+            }
+            else
             {
                 throw new AdbException($"The server sent an invali repsonse {result}");
             }
@@ -249,12 +252,13 @@ public void Pull(string remoteFilepath, Stream stream, IProgress<int> progress,
 
                 if (response == SyncCommand.DONE)
                 {
+                    this.Socket.ReadSyncString();
                     break;
                 }
                 else if (response == SyncCommand.FAIL)
                 {
                     var message = this.Socket.ReadSyncString();
-                    throw new AdbException($"Failed to pull '{remoteFilepath}'. {message}");
+                    throw new AdbException(message);
                 }
                 else if (response != SyncCommand.DATA)
                 {
@@ -293,22 +297,26 @@ public void Pull(string remoteFilepath, Stream stream, IProgress<int> progress,
         /// <inheritdoc/>
         public FileStatistics Stat(string remotePath)
         {
-            // create the stat request message.
             this.Socket.SendSyncRequest(SyncCommand.STAT, remotePath);
-
-            if (this.Socket.ReadSyncResponse() != SyncCommand.STAT)
+            var response = this.Socket.ReadSyncResponse();
+            if (response == SyncCommand.STAT)
+            {
+                FileStatistics value = new FileStatistics
+                {
+                    Path = remotePath
+                };
+                this.ReadStatistics(value);
+                return value;
+            }
+            else if (response == SyncCommand.FAIL)
+            {
+                var message = this.Socket.ReadSyncString();
+                throw new AdbException(message);
+            }
+            else
             {
                 throw new AdbException($"The server returned an invalid sync response.");
             }
-
-            // read the result, in a byte array containing 3 ints
-            // (mode, size, time)
-            FileStatistics value = new FileStatistics();
-            value.Path = remotePath;
-
-            this.ReadStatistics(value);
-
-            return value;
         }
 
         /// <inheritdoc/>
@@ -323,20 +331,28 @@ public IEnumerable<FileStatistics> GetDirectoryListing(string remotePath)
             {
                 var response = this.Socket.ReadSyncResponse();
 
-                if (response == SyncCommand.DONE)
+                if (response == SyncCommand.DENT)
+                {
+                    FileStatistics entry = new FileStatistics();
+                    this.ReadStatistics(entry);
+                    entry.Path = this.Socket.ReadSyncString();
+                    value.Add(entry);
+                }
+                else if (response == SyncCommand.DONE)
                 {
+                    var ignoreBuf = new byte[16];
+                    this.Socket.Read(ignoreBuf);
                     break;
                 }
-                else if (response != SyncCommand.DENT)
+                else if (response == SyncCommand.FAIL)
+                {
+                    var message = this.Socket.ReadSyncString();
+                    throw new AdbException(message);
+                }
+                else
                 {
                     throw new AdbException($"The server returned an invalid sync response.");
                 }
-
-                FileStatistics entry = new FileStatistics();
-                this.ReadStatistics(entry);
-                entry.Path = this.Socket.ReadSyncString();
-
-                value.Add(entry);
             }
 
             return value;