(ios) improve error handling for loadMediaCallback

jellyfin-archive · Jan 25, 2020 · 2cb3b33 · 2cb3b33
1 parent 35cd482
commit 2cb3b33
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/ios/MLPChromecastSession.m b/src/ios/MLPChromecastSession.m
@@ -72,13 +72,15 @@ -(MLPCastRequestDelegate*)createLoadMediaRequestDelegate:(CDVInvokedUrlCommand*)
     };
     return [self createRequestDelegate:command success:^{
     } failure:^(GCKError * error) {
+        loadMediaCallback(error.description);
         loadMediaCallback = nil;
-        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:error.description];
-        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
     } abortion:^(GCKRequestAbortReason abortReason) {
+        if (abortReason == GCKRequestAbortReasonReplaced) {
+            loadMediaCallback(@"aborted loadMedia/queueLoad request reason: GCKRequestAbortReasonReplaced");
+        } else if (abortReason == GCKRequestAbortReasonCancelled) {
+            loadMediaCallback(@"aborted loadMedia/queueLoad request reason: GCKRequestAbortReasonCancelled");
+        }
         loadMediaCallback = nil;
-        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsNSInteger:abortReason];
-        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
     }];
 }
 
@@ -406,7 +408,9 @@ - (void)remoteMediaClient:(GCKRemoteMediaClient *)client didReceiveQueueItemIDs:
     if (!loadMediaCallback) {
         // So set the callback to trigger the MEDIA_LOAD event
         loadMediaCallback = ^(NSString* error) {
-            if (!error) {
+            if (error) {
+                NSLog(@"%@%@", @"Chromecast Error: ", error);
+            } else {
                 [self.sessionListener onMediaLoaded:[MLPCastUtilities createMediaObject:currentSession]];
             }
         };
@@ -418,8 +422,14 @@ - (void)remoteMediaClient:(GCKRemoteMediaClient *)client didReceiveQueueItemIDs:
         loadMediaCallback(nil);
         loadMediaCallback = nil;
     } failure:^(GCKError * error) {
+        loadMediaCallback([GCKError enumDescriptionForCode:error.code]);
         loadMediaCallback = nil;
     } abortion:^(GCKRequestAbortReason abortReason) {
+        if (abortReason == GCKRequestAbortReasonReplaced) {
+            loadMediaCallback(@"aborted loadMedia/queueLoad fetch request reason: GCKRequestAbortReasonReplaced");
+        } else if (abortReason == GCKRequestAbortReasonCancelled) {
+            loadMediaCallback(@"aborted loadMedia/queueLoad fetch request reason: GCKRequestAbortReasonCancelled");
+        }
         loadMediaCallback = nil;
     }];
 }