Merge pull request #6134 from alexzatsepin/fix-mopub-trackingbeta-832beta-831beta-830

[android] Fixed mopub impression and clicks tracking

3 files changed, 9 insertions, 10 deletions

diff --git a/android/gradle.properties b/android/gradle.properties
index 4c0b18a4b4..41845738d3 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -4,8 +4,8 @@ propMinSdkVersion=15
 propTargetSdkVersion=22
 propCompileSdkVersion=23
 propBuildToolsVersion=25.0.2
-propVersionCode=734
-propVersionName=7.3.4
+propVersionCode=735
+propVersionName=7.3.5
 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
 org.gradle.daemon=true
diff --git a/android/src/com/mapswithme/maps/ads/MopubNativeAd.java b/android/src/com/mapswithme/maps/ads/MopubNativeAd.java
index d69bbc5180..88be1d5d27 100644
--- a/android/src/com/mapswithme/maps/ads/MopubNativeAd.java
+++ b/android/src/com/mapswithme/maps/ads/MopubNativeAd.java
@@ -6,7 +6,6 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.mopub.nativeads.BaseNativeAd;
 import com.mopub.nativeads.NativeAd;
 import com.mopub.nativeads.NativeImageHelper;
 import com.mopub.nativeads.StaticNativeAd;
@@ -87,16 +86,16 @@ class MopubNativeAd extends CachedMwmNativeAd
   @Override
   void detachAdListener()
   {
-    mAd.setNativeEventListener(null);
+    mNativeAd.setMoPubNativeEventListener(null);
   }
 
   @Override
   void attachAdListener(@NonNull Object listener)
   {
-    if (!(listener instanceof BaseNativeAd.NativeEventListener))
+    if (!(listener instanceof NativeAd.MoPubNativeEventListener))
       throw new AssertionError("A listener for MoPub ad must be instance of " +
                                "NativeAd.MoPubNativeEventListener class! Not '"
                                + listener.getClass() + "'!");
-    mAd.setNativeEventListener((BaseNativeAd.NativeEventListener) listener);
+    mNativeAd.setMoPubNativeEventListener((NativeAd.MoPubNativeEventListener) listener);
   }
 }
diff --git a/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java b/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java
index 0d7105e2b9..18980a5f6e 100644
--- a/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java
+++ b/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java
@@ -23,7 +23,7 @@ import com.mopub.nativeads.StaticNativeAd;
 import java.util.EnumSet;
 
 class MopubNativeDownloader extends CachingNativeAdLoader
-    implements MoPubNative.MoPubNativeNetworkListener, BaseNativeAd.NativeEventListener
+    implements MoPubNative.MoPubNativeNetworkListener, NativeAd.MoPubNativeEventListener
 {
   private final static Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
   private final static String TAG = MopubNativeDownloader.class.getSimpleName();
@@ -76,7 +76,7 @@ class MopubNativeDownloader extends CachingNativeAdLoader
   @Override
   public void onNativeLoad(final NativeAd nativeAd)
   {
-    nativeAd.getBaseNativeAd().setNativeEventListener(this);
+    nativeAd.setMoPubNativeEventListener(this);
     LOGGER.d(TAG, "onNativeLoad nativeAd = " + nativeAd);
     CachedMwmNativeAd ad = new MopubNativeAd(nativeAd, SystemClock.elapsedRealtime());
     onAdLoaded(nativeAd.getAdUnitId(), ad);
@@ -93,13 +93,13 @@ class MopubNativeDownloader extends CachingNativeAdLoader
   }
 
   @Override
-  public void onAdImpressed()
+  public void onImpression(View view)
   {
     LOGGER.d(TAG, "on MoPub Ad impressed");
   }
 
   @Override
-  public void onAdClicked()
+  public void onClick(View view)
   {
     if (!TextUtils.isEmpty(mBannerId))
       onAdClicked(mBannerId);