From 20a32c9d05d7fc06c4e5da7d611e07518791e578 Mon Sep 17 00:00:00 2001 From: Dawid Juszczak Date: Tue, 20 Aug 2019 16:19:05 +0200 Subject: [PATCH] [fix][mediacontroller] add callIfPossible to listeners This commit adds callIfPossible functions to listeners to avoid calling not set callbacks. Change-Id: I91b36177eac0286d644fd298d9ad253e3586badb Signed-off-by: Dawid Juszczak --- src/mediacontroller/mediacontroller_api.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mediacontroller/mediacontroller_api.js b/src/mediacontroller/mediacontroller_api.js index aef8c56..f682337 100755 --- a/src/mediacontroller/mediacontroller_api.js +++ b/src/mediacontroller/mediacontroller_api.js @@ -198,7 +198,7 @@ var ServerInfoStatusListener = new ListenerManager( native_, '_ServerInfoStatusListener', function(msg, listener) { - listener(msg.state); + native_.callIfPossible(listener, msg.state); } ); @@ -207,23 +207,23 @@ var ServerInfoPlaybackInfoListener = new ListenerManager( '_ServerInfoPlaybackInfoListener', function(msg, listener) { if (msg.action === 'onplaybackchanged') { - listener[msg.action](msg.state, msg.position); + native_.callIfPossible(listener[msg.action], msg.state, msg.position); } if (msg.action === 'onshufflemodechanged') { - listener[msg.action](msg.mode); + native_.callIfPossible(listener[msg.action], msg.mode); } if (msg.action === 'onrepeatmodechanged') { utils_.printDeprecationWarningFor( 'onrepeatmodechanged', 'onrepeatstatechanged' ); - listener[msg.action](msg.mode); + native_.callIfPossible(listener[msg.action], msg.mode); } if (msg.action === 'onrepeatstatechanged') { - listener[msg.action](msg.state); + native_.callIfPossible(listener[msg.action], msg.state); } if (msg.action === 'onmetadatachanged') { - listener[msg.action](new MediaControllerMetadata(msg.metadata)); + native_.callIfPossible(listener[msg.action], new MediaControllerMetadata(msg.metadata)); } } ); @@ -233,10 +233,10 @@ var ServerInfoPlaylistUpdatedListener = new ListenerManager( '_ServerInfoPlaylistUpdatedListener', function(msg, listener) { if (msg.action === 'onplaylistupdated') { - listener[msg.action](msg.serverName, new MediaControllerPlaylist(msg)); + native_.callIfPossible(listener[msg.action], msg.serverName, new MediaControllerPlaylist(msg)); } if (msg.action === 'onplaylistdeleted') { - listener[msg.action](msg.serverName, msg.name); + native_.callIfPossible(listener[msg.action], msg.serverName, msg.name); } } ); -- 2.7.4