From e4ee402aefb9da2d204dd217ee6e5e4cdaa69054 Mon Sep 17 00:00:00 2001 From: Elliot Hesp Date: Sat, 27 May 2017 17:27:22 +0100 Subject: [PATCH] [admob][android] Move RewardedEventTypes to statics --- lib/modules/admob/RewardedVideo.js | 9 +++++++-- lib/modules/admob/index.js | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/modules/admob/RewardedVideo.js b/lib/modules/admob/RewardedVideo.js index fc9142f7..773a827e 100644 --- a/lib/modules/admob/RewardedVideo.js +++ b/lib/modules/admob/RewardedVideo.js @@ -72,8 +72,13 @@ export default class RewardedVideo { * @returns {null} */ on(eventType, listenerCb) { - if ((eventType !== 'onRewarded' || eventType !== 'onRewardedVideoStarted') && !statics.EventTypes[eventType]) { - console.warn(`Invalid event type provided, must be one of: ${Object.keys(statics.EventTypes).join(', ')}, onRewarded, onRewardedVideoStarted`); + const types = { + ...statics.EventTypes, + ...statics.RewardedVideoEventTypes, + }; + + if (!types[eventType]) { + console.warn(`Invalid event type provided, must be one of: ${Object.keys(types).join(', ')}`); return null; } diff --git a/lib/modules/admob/index.js b/lib/modules/admob/index.js index 41b69b2e..c4a7ccb3 100644 --- a/lib/modules/admob/index.js +++ b/lib/modules/admob/index.js @@ -67,4 +67,8 @@ export const statics = { onAdClosed: 'onAdClosed', onAdFailedToLoad: 'onAdFailedToLoad', }, + RewardedVideoEventTypes: { + onRewarded: 'onRewarded', + onRewardedVideoStarted: 'onRewardedVideoStarted', + }, };