Merge pull request #106 from petrroll/configureAwaitFix

Configure await fix + removed bunch of unnecessary async/await before return

Author: Jonas Dellinger

SpotifyAPI/Local/Models/Track.cs

@@ -103,7 +103,7 @@ public async Task<Bitmap> GetAlbumArtAsync(AlbumArtSize size)
                 string url = GetAlbumArtUrl(size);
                 if (url == "")
                     return null;
-                var data = await wc.DownloadDataTaskAsync(url);
+                var data = await wc.DownloadDataTaskAsync(url).ConfigureAwait(false);
                 using (MemoryStream ms = new MemoryStream(data))
                 {
                     return (Bitmap)Image.FromStream(ms);
@@ -116,15 +116,15 @@ public async Task<Bitmap> GetAlbumArtAsync(AlbumArtSize size)
         /// </summary>
         /// <param name="size">AlbumArtSize (160,320,640)</param>
         /// <returns>A byte[], which is the albumart in binary data</returns>
-        public async Task<byte[]> GetAlbumArtAsByteArrayAsync(AlbumArtSize size)
+        public Task<byte[]> GetAlbumArtAsByteArrayAsync(AlbumArtSize size)
         {
             using (WebClient wc = new WebClient())
             {
                 wc.Proxy = null;
                 string url = GetAlbumArtUrl(size);
                 if (url == "")
                     return null;
-                return await wc.DownloadDataTaskAsync(url);
+                return wc.DownloadDataTaskAsync(url);
             }
         }
 

SpotifyAPI/Local/RemoteHandler.cs

@@ -24,23 +24,23 @@ internal Boolean Init()
 
         internal async Task SendPauseRequest()
         {
-            await QueryAsync("remote/pause.json?pause=true", true, true, -1);
+            await QueryAsync("remote/pause.json?pause=true", true, true, -1).ConfigureAwait(false);
         }
 
         internal async Task SendPlayRequest()
         {
-            await QueryAsync("remote/pause.json?pause=false", true, true, -1);
+            await QueryAsync("remote/pause.json?pause=false", true, true, -1).ConfigureAwait(false);
         }
 
         internal async Task SendPlayRequest(string url, string context = "")
         {
             // TODO: instead of having an empty context, one way to fix the bug with the playback time beyond the length of a song would be to provide a 1-song context, and it would be fixed.
-            await QueryAsync($"remote/play.json?uri={url}&context={context}", true, true, -1);
+            await QueryAsync($"remote/play.json?uri={url}&context={context}", true, true, -1).ConfigureAwait(false);
         }
 
         internal async Task SendQueueRequest(string url)
         {
-            await QueryAsync("remote/play.json?uri=" + url + "?action=queue", true, true, -1);
+            await QueryAsync("remote/play.json?uri=" + url + "?action=queue", true, true, -1).ConfigureAwait(false);
         }
 
         internal StatusResponse GetNewStatus()
@@ -151,7 +151,7 @@ internal async Task<string> QueryAsync(string request, bool oauth, bool cfid, in
                 using (var wc = new ExtendedWebClient())
                 {
                     if (SpotifyLocalAPI.IsSpotifyRunning())
-                        response = "[ " + await wc.DownloadStringTaskAsync(new Uri(address)) + " ]";
+                        response = "[ " + await wc.DownloadStringTaskAsync(new Uri(address)).ConfigureAwait(false) + " ]";
                 }
             }
             catch