Preload listener removed and integrated with ad listener.

Author: demiremrece

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDPreloadListener.java

@@ -28,7 +28,6 @@
 public class GDad {
 
     GDadListener devListener;
-    GDPreloadListener preloadListener;
     private PublisherInterstitialAd mInterstitialAd;
     private Activity mContext;
     private String mUnitId;
@@ -208,10 +207,10 @@ public void onAdClosed() {
                     devListener.onBannerClosed();
 
                 if(isPreloadStream){
-
+                    requestPreloadAd();
                 }
-                if(preloadListener != null){
-                    preloadListener.onPreloadedAdCompleted();
+                if(isPreloadStream && GDlogger.gDad.devListener != null){
+                    GDlogger.gDad.devListener.onPreloadedAdCompleted();
                 }
             }
 
@@ -274,8 +273,8 @@ public void onAdLoaded() {
                 if(!GDstatic.testAds)
                     gdRequestAdHandler.Succes();
 
-                if(preloadListener != null){
-                    preloadListener.onAdPreloaded();
+                if(isPreloadStream && GDlogger.gDad.devListener != null){
+                    GDlogger.gDad.devListener.onAdPreloaded();
                 }
             }
         });
@@ -547,18 +546,12 @@ public void setPreloadStream(boolean preloadStream) {
     }
 
     public boolean isPreloadedAdExist(){
+        if (getmInterstitialAd() == null) return false;
         return getmInterstitialAd().isLoaded() && isPreloadStream();
     }
 
     public boolean isPreloadedAdLoading(){
+        if (getmInterstitialAd() == null) return false;
         return  getmInterstitialAd().isLoading() && isPreloadStream();
     }
-
-    public GDPreloadListener getPreloadListener() {
-        return preloadListener;
-    }
-
-    public void setPreloadListener(GDPreloadListener preloadListener) {
-        this.preloadListener = preloadListener;
-    }
 }

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDad.java

@@ -18,5 +18,11 @@ public void onAPIReady(){
     }
     public void onAPINotReady(String error){
     }
+    public void onPreloadedAdCompleted() {
+    }
+    public void onAdPreloaded() {
+    }
+    public void onPreloadFailed(String msg) {
+    }
 
 }

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDadListener.java

@@ -70,6 +70,8 @@ public void onError(VolleyError error) {
         }
         else if(GDstatic.testAds){
             GDlogger.gDad.init(GDlogger.mContext,GDlogger.isCordovaPlugin);
+            GDlogger.gdPreloadStream.setPreloadStream(true);
+            GDlogger.gdPreloadStream.init(GDlogger.mContext, GDlogger.isCordovaPlugin);
         }
     }
 
@@ -147,14 +149,14 @@ protected static void ShowPreloadedBanner(){
         if(GDlogger.gdPreloadStream.isPreloadedAdExist())
             GDlogger.gdPreloadStream.showInterstitialAd();
         else if(!GDlogger.gdPreloadStream.isPreloadedAdLoading()){
-            if(GDlogger.gdPreloadStream.preloadListener != null){
-                GDlogger.gdPreloadStream.preloadListener.onPreloadFailed("No ads found preloaded.");
+            if(GDlogger.gDad.devListener != null){
+                GDlogger.gDad.devListener.onPreloadFailed("No ads found preloaded.");
             }
             GDlogger.gdPreloadStream.requestPreloadAd();
         }
         else{
-            if(GDlogger.gdPreloadStream.preloadListener != null){
-                GDlogger.gdPreloadStream.preloadListener.onPreloadFailed("A preload ad is currently being loaded.");
+            if(GDlogger.gDad.devListener != null){
+                GDlogger.gDad.devListener.onPreloadFailed("A preload ad is currently being loaded.");
             }
         }
     }

Source/GDApi/gdapi/src/main/java/com/gd/analytics/GDbanner.java

@@ -122,8 +122,8 @@ public static void ShowPreloadedAd(){
             }
         }
         else{
-            if(GDlogger.gdPreloadStream.preloadListener != null)
-                GDlogger.gdPreloadStream.preloadListener.onPreloadFailed("API cannot connect to internet. Please check the network connection.");
+            if(GDlogger.gDad.devListener != null)
+                GDlogger.gDad.devListener.onPreloadFailed("API cannot connect to internet. Please check the network connection.");
         }
     }
 
@@ -132,10 +132,6 @@ public static void setAdListener(GDadListener gDadListener) {
             gDad.setAdListener(gDadListener);
     }
 
-    public static void setPreloadAdListener(GDPreloadListener preloadAdListener){
-        if(gdPreloadStream != null)
-            gdPreloadStream.setPreloadListener(preloadAdListener);
-    }
     /**
      * GDlogger hides banner
      */