Merge pull request #29 from jmartine2/master

Fixed issues #27 and #28
Baseflow · Oct 12, 2016 · b87f45d · b87f45d
2 parents ba50fa0 + bca6696
commit b87f45d
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/MediaManager/Plugin.MediaManager.Android/MediaPlayerService.cs b/MediaManager/Plugin.MediaManager.Android/MediaPlayerService.cs
@@ -446,7 +446,16 @@ public async Task Play()
                             Cover = await BitmapFactory.DecodeResourceAsync(Resources, Resource.Drawable.ButtonStar);
                     }
                     else
-                        Cover = await BitmapFactory.DecodeByteArrayAsync(imageByteArray, 0, imageByteArray.Length);
+                    {
+                        try
+                        {
+                            Cover = await BitmapFactory.DecodeByteArrayAsync(imageByteArray, 0, imageByteArray.Length);
+                        }
+                        catch (Java.Lang.OutOfMemoryError)
+                        {
+                            Cover = null;
+                        }
+                    }
                     StartedPlayback = true;
                 }
                 catch (Exception ex)
@@ -934,7 +943,13 @@ private void ReleaseWifiLock()
             if (wifiLock == null || !wifiLock.IsHeld)
                 return;
 
-            wifiLock.Release();
+            try
+            {
+                wifiLock.Release();
+            }
+            catch (Java.Lang.RuntimeException)
+            { }
+
             wifiLock = null;
         }