fix: set artwork when playing from webview (#209)

Author: kesha-antonov

ios/MusicControlManager.m

@@ -80,10 +80,7 @@ - (dispatch_queue_t)methodQueue
     center.nowPlayingInfo = [self update:mediaDict with:details andSetDefaults:false];
 
     NSString *artworkUrl = [self getArtworkUrl:[originalDetails objectForKey:@"artwork"]];
-    if (![artworkUrl isEqualToString:self.artworkUrl] && artworkUrl != nil) {
-        self.artworkUrl = artworkUrl;
-        [self updateArtworkIfNeeded:artworkUrl];
-    }
+    [self updateArtworkIfNeeded:artworkUrl];
 }
 
 
@@ -285,54 +282,66 @@ - (void)sendEventWithValue:(NSString*)event withValue:(NSString*)value{
 
 - (void)updateArtworkIfNeeded:(id)artworkUrl
 {
-    if (artworkUrl != nil) {
-        self.artworkUrl = artworkUrl;
-
-        // Custom handling of artwork in another thread, will be loaded async
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
-            UIImage *image = nil;
-
-            // check whether artwork path is present
-            if (![artworkUrl isEqual: @""]) {
-                // artwork is url download from the interwebs
-                if ([artworkUrl hasPrefix: @"http://"] || [artworkUrl hasPrefix: @"https://"]) {
-                    NSURL *imageURL = [NSURL URLWithString:artworkUrl];
-                    NSData *imageData = [NSData dataWithContentsOfURL:imageURL];
-                    image = [UIImage imageWithData:imageData];
-                } else {
-                    NSString *localArtworkUrl = [artworkUrl stringByReplacingOccurrencesOfString:@"file://" withString:@""];
-                    BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:localArtworkUrl];
-                    if (fileExists) {
-                        image = [UIImage imageNamed:localArtworkUrl];
-                    }
-                }
-            }
+    if( artworkUrl == nil ) {
+        return;
+    }
 
-            // Check if image was available otherwise don't do anything
-            if (image == nil) {
-                return;
+    MPNowPlayingInfoCenter *center = [MPNowPlayingInfoCenter defaultCenter];
+    if ([artworkUrl isEqualToString:self.artworkUrl] && [center.nowPlayingInfo objectForKey:MPMediaItemPropertyArtwork] != nil) {
+        return;
+    }
+
+    self.artworkUrl = artworkUrl;
+
+    // Custom handling of artwork in another thread, will be loaded async
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
+        UIImage *image = nil;
+
+        // check whether artwork path is present
+        if ([artworkUrl isEqual: @""]) {
+            return;
+        }
+
+        // artwork is url download from the interwebs
+        if ([artworkUrl hasPrefix: @"http://"] || [artworkUrl hasPrefix: @"https://"]) {
+            NSURL *imageURL = [NSURL URLWithString:artworkUrl];
+            NSData *imageData = [NSData dataWithContentsOfURL:imageURL];
+            image = [UIImage imageWithData:imageData];
+        } else {
+            NSString *localArtworkUrl = [artworkUrl stringByReplacingOccurrencesOfString:@"file://" withString:@""];
+            BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:localArtworkUrl];
+            if (fileExists) {
+                image = [UIImage imageNamed:localArtworkUrl];
             }
+        }
+
+        // Check if image was available otherwise don't do anything
+        if (image == nil) {
+            return;
+        }
 
-            // check whether image is loaded
-            CGImageRef cgref = [image CGImage];
-            CIImage *cim = [image CIImage];
+        // check whether image is loaded
+        CGImageRef cgref = [image CGImage];
+        CIImage *cim = [image CIImage];
 
-            if (cim != nil || cgref != NULL) {
+        if (cim == nil && cgref == NULL) {
+            return;
+        }
 
-                dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
 
-                    // Check if URL wasn't changed in the meantime
-                    if ([artworkUrl isEqual:self.artworkUrl]) {
-                        MPNowPlayingInfoCenter *center = [MPNowPlayingInfoCenter defaultCenter];
-                        MPMediaItemArtwork *artwork = [[MPMediaItemArtwork alloc] initWithImage: image];
-                        NSMutableDictionary *mediaDict = (center.nowPlayingInfo != nil) ? [[NSMutableDictionary alloc] initWithDictionary: center.nowPlayingInfo] : [NSMutableDictionary dictionary];
-                        [mediaDict setValue:artwork forKey:MPMediaItemPropertyArtwork];
-                        center.nowPlayingInfo = mediaDict;
-                    }
-                });
+            // Check if URL wasn't changed in the meantime
+            if (![artworkUrl isEqual:self.artworkUrl]) {
+                return;
             }
+
+            MPNowPlayingInfoCenter *center = [MPNowPlayingInfoCenter defaultCenter];
+            MPMediaItemArtwork *artwork = [[MPMediaItemArtwork alloc] initWithImage: image];
+            NSMutableDictionary *mediaDict = (center.nowPlayingInfo != nil) ? [[NSMutableDictionary alloc] initWithDictionary: center.nowPlayingInfo] : [NSMutableDictionary dictionary];
+            [mediaDict setValue:artwork forKey:MPMediaItemPropertyArtwork];
+            center.nowPlayingInfo = mediaDict;
         });
-    }
+    });
 }
 
 - (void)audioHardwareRouteChanged:(NSNotification *)notification {