From 18f99832e0d80b5cd023ee41c13c94fad4356ecd Mon Sep 17 00:00:00 2001
From: svzi <info@sven-ziegler.com>
Date: Fri, 8 Sep 2017 10:56:12 +0200
Subject: [PATCH] checked if AdMob is enabled, before initialization of AdMob

---
 firebase.android.js | 73 +++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/firebase.android.js b/firebase.android.js
index ab9b4145..d43bee67 100755
--- a/firebase.android.js
+++ b/firebase.android.js
@@ -208,9 +208,6 @@ firebase.init = function (arg) {
 
       var firebaseAuth = com.google.firebase.auth.FirebaseAuth.getInstance();
 
-      // init admob
-      com.google.android.gms.ads.MobileAds.initialize(appModule.android.context); // TODO not sure its bound to packagename.. this is from the admob-demo
-
       if (arg.onAuthStateChanged) {
         firebase.authStateListener = new com.google.firebase.auth.FirebaseAuth.AuthStateListener({
           onAuthStateChanged: function (fbAuth) {
@@ -268,6 +265,12 @@ firebase.init = function (arg) {
         });
       }
 
+      // Firebase AdMob
+      if (typeof(com.google.android.gms.ads) !== "undefined") {
+        // init admob
+        com.google.android.gms.ads.MobileAds.initialize(appModule.android.context); 
+      }
+        
       resolve(firebase.instance);
     }
 
@@ -545,38 +548,38 @@ firebase.admob.showBanner = function (arg) {
 };
 
 firebase.admob.showInterstitial = function (arg) {
-  return new Promise(function (resolve, reject) {
-    try {
-      var settings = firebase.merge(arg, firebase.admob.defaults);
-      firebase.admob.interstitialView = new com.google.android.gms.ads.InterstitialAd(appModule.android.foregroundActivity);
-      firebase.admob.interstitialView.setAdUnitId(settings.androidInterstitialId);
-
-      // Interstitial ads must be loaded before they can be shown, so adding a listener
-      var InterstitialAdListener = com.google.android.gms.ads.AdListener.extend({
-        onAdLoaded: function () {
-          firebase.admob.interstitialView.show();
-          resolve();
-        },
-        onAdFailedToLoad: function (errorCode) {
-          reject(errorCode);
-        },
-        onAdClosed: function () {
-          firebase.admob.interstitialView.setAdListener(null);
-          firebase.admob.interstitialView = null;
-        }
-      });
-      firebase.admob.interstitialView.setAdListener(new InterstitialAdListener());
-
-      var ad = firebase.admob._buildAdRequest(settings);
-      firebase.admob.interstitialView.loadAd(ad);
-    } catch (ex) {
-      console.log("Error in firebase.admob.showInterstitial: " + ex);
-      reject(ex);
-    }
-  });
-};
-
-firebase.admob.hideBanner = function (arg) {
+    return new Promise(function (resolve, reject) {
+      try {
+        var settings = firebase.merge(arg, firebase.admob.defaults);
+        firebase.admob.interstitialView = new com.google.android.gms.ads.InterstitialAd(appModule.android.foregroundActivity);
+        firebase.admob.interstitialView.setAdUnitId(settings.androidInterstitialId);
+  
+        // Interstitial ads must be loaded before they can be shown, so adding a listener
+        var InterstitialAdListener = com.google.android.gms.ads.AdListener.extend({
+          onAdLoaded: function () {
+            firebase.admob.interstitialView.show();
+            resolve();
+          },
+          onAdFailedToLoad: function (errorCode) {
+            reject(errorCode);
+          },
+          onAdClosed: function () {
+            firebase.admob.interstitialView.setAdListener(null);
+            firebase.admob.interstitialView = null;
+          }
+        });
+        firebase.admob.interstitialView.setAdListener(new InterstitialAdListener());
+  
+        var ad = firebase.admob._buildAdRequest(settings);
+        firebase.admob.interstitialView.loadAd(ad);
+      } catch (ex) {
+        console.log("Error in firebase.admob.showInterstitial: " + ex);
+        reject(ex);
+      }
+    });
+  };
+  
+  firebase.admob.hideBanner = function (arg) {
   return new Promise(function (resolve, reject) {
     try {
       if (firebase.admob.adView !== null) {