Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/base/datarecovery/ads/max/AdMaxNativeUtils.kt
#	app/src/main/java/com/base/datarecovery/ads/max/AdMaxOpenUtils.kt

app/src/main/java/com/base/datarecovery/ads/max/AdMaxNativeUtils.kt

@@ -107,7 +107,7 @@ object AdMaxNativeUtils {
     }
 
 
-    fun showNativeAd(activity: Activity, parent: ViewGroup, layout: Int) {
+    fun showNativeAd(activity: Activity, parent: ViewGroup, layout: Int ) {
         setNativeAdListener()
         if (!AdDisplayUtils.getInstance().shouldShowAd("nativeAd")) {
             return
@@ -126,7 +126,7 @@ object AdMaxNativeUtils {
                     nativeAdLoader.render(adView, nativeAd)
                     parent.removeAllViews()
                     parent.addView(adView)
-                    nativeAd?.let { AdMaxEvent.showAd(it, "nativeAd", activity) }
+                    nativeAd?.let { AdMaxEvent.showAd(it, "nativeAd",activity) }
                     AdDisplayUtils.getInstance().incrementAdDisplayCount()
                 }
             }

app/src/main/java/com/base/datarecovery/ads/max/AdMaxOpenUtils.kt

@@ -20,29 +20,29 @@ object AdMaxOpenUtils {
     private var onHidden: (() -> Unit)? = null
     private var loadingListener: (() -> Unit)? = null
 
-    private fun setListener(activity: Activity) {
+    private fun setListener(context: Context) {
         if (appOpenAd == null) {
-            appOpenAd = MaxAppOpenAd(ConfigHelper.openAdMaxId, activity)
+            appOpenAd = MaxAppOpenAd(ConfigHelper.openAdMaxId, context)
 
             appOpenAd?.setListener(object : MaxAdListener {
                 override fun onAdLoaded(p0: MaxAd) {
                     LogEx.logDebug(TAG, "onAdLoaded")
                     openLoadTime = System.currentTimeMillis()
                     loadingListener?.invoke()
-                    AdMaxEvent.pullAd(p0, "openAd")
+                    AdMaxEvent.pullAd(p0,"openAd")
                 }
 
                 override fun onAdLoadFailed(p0: String, p1: MaxError) {
-                    LogEx.logDebug(TAG, "onAdLoadFailed:" + p1.message.toString())
+                    LogEx.logDebug(TAG, "onAdLoadFailed:"+p1.message.toString())
                     onHidden?.invoke()
                     AdDisplayUtils.getInstance().incrementAdRequestFailCount()
-                    AdMaxEvent.pullAd(null, "openAd")
+                    AdMaxEvent.pullAd(null,"openAd")
                 }
 
 
                 override fun onAdDisplayed(p0: MaxAd) {
                     AdDisplayUtils.getInstance().incrementAdDisplayCount()
-                    AdMaxEvent.showAd(p0, "openAd", activity)
+                    AdMaxEvent.showAd(p0,"openAd",Activity())
                 }
 
                 override fun onAdHidden(p0: MaxAd) {
@@ -55,7 +55,7 @@ object AdMaxOpenUtils {
                     AdDisplayUtils.getInstance().incrementAdClickCount()
 //                    com.base.datarecovery.ads.max.AdMaxEvent.clickAd(appOpenAd, "openAd")
                     AdmobCommonUtils.isMultiClick(appOpenAd)
-                    AdMaxEvent.clickAd(p0, "openAd")
+                    AdMaxEvent.clickAd(p0,"openAd")
                 }
 
 
@@ -71,7 +71,7 @@ object AdMaxOpenUtils {
                 }
             })
 
-            appOpenAd?.setRevenueListener(AdMaxEvent.EventOnPaidEventListener())
+            appOpenAd?.setRevenueListener (AdMaxEvent.EventOnPaidEventListener())
         }
     }