From 4b038a2f29704274b3aede63a33955690ed9919c Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Tue, 25 Sep 2018 20:40:16 +0300
Subject: [PATCH] [android] Updated my target version

---
 android/build.gradle                          |  5 ++++-
 .../maps/ads/MyTargetAdsLoader.java           | 20 ++++++++++++++++++-
 .../mapswithme/maps/ads/MyTargetNativeAd.java |  4 ++--
 .../analytics/ExternalLibrariesMediator.java  |  2 ++
 .../util/statistics/MytargetHelper.java       | 13 +++++++++++-
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 847f3c0f3f..f8f9c67df2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -75,8 +75,11 @@ dependencies {
   implementation 'com.pushwoosh:pushwoosh:5.8.6'
   implementation 'com.pushwoosh:pushwoosh-gcm:5.8.6'
   implementation 'com.my.tracker:mytracker-sdk:1.5.3'
-  implementation ('com.my.target:mytarget-sdk:4.6.14') {
+  implementation ('com.my.target:mytarget-sdk:5.2.2') {
     exclude group: 'com.android.support'
+    exclude group: 'com.google.android.exoplayer', module:'exoplayer-core'
+    exclude group: 'com.google.android.exoplayer', module:'exoplayer-dash'
+    exclude group: 'com.google.android.exoplayer', module:'exoplayer-hls'
   }
   implementation('com.mopub:mopub-sdk-native-static:5.0.0@aar') {
     exclude group: 'com.android.support'
diff --git a/android/src/com/mapswithme/maps/ads/MyTargetAdsLoader.java b/android/src/com/mapswithme/maps/ads/MyTargetAdsLoader.java
index f5faa9c308..dcbfd181c9 100644
--- a/android/src/com/mapswithme/maps/ads/MyTargetAdsLoader.java
+++ b/android/src/com/mapswithme/maps/ads/MyTargetAdsLoader.java
@@ -8,7 +8,7 @@ import android.support.annotation.Nullable;
 import com.mapswithme.maps.PrivateVariables;
 import com.mapswithme.util.log.Logger;
 import com.mapswithme.util.log.LoggerFactory;
-import com.my.target.ads.CustomParams;
+import com.my.target.common.CustomParams;
 import com.my.target.nativeads.NativeAd;
 import net.jcip.annotations.NotThreadSafe;
 
@@ -64,6 +64,24 @@ class MyTargetAdsLoader extends CachingNativeAdLoader implements NativeAd.Native
     // No op.
   }
 
+  @Override
+  public void onVideoPlay(@NonNull NativeAd nativeAd)
+  {
+
+  }
+
+  @Override
+  public void onVideoPause(@NonNull NativeAd nativeAd)
+  {
+
+  }
+
+  @Override
+  public void onVideoComplete(@NonNull NativeAd nativeAd)
+  {
+
+  }
+
   @NonNull
   @Override
   String getProvider()
diff --git a/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java b/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java
index 2ffa51b214..96eeb7d2f2 100644
--- a/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java
+++ b/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java
@@ -5,10 +5,10 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.my.target.ads.CustomParams;
+import com.my.target.common.CustomParams;
+import com.my.target.common.models.ImageData;
 import com.my.target.nativeads.NativeAd;
 import com.my.target.nativeads.banners.NativePromoBanner;
-import com.my.target.nativeads.models.ImageData;
 
 import java.util.Map;
 
diff --git a/android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java b/android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java
index a23ced270d..0f8146b8f8 100644
--- a/android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java
+++ b/android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java
@@ -21,6 +21,7 @@ import com.mapswithme.util.log.Logger;
 import com.mapswithme.util.log.LoggerFactory;
 import com.mopub.common.MoPub;
 import com.mopub.common.SdkConfiguration;
+import com.my.target.common.MyTargetPrivacy;
 import io.fabric.sdk.android.Fabric;
 
 import java.io.IOException;
@@ -189,6 +190,7 @@ public class ExternalLibrariesMediator
     private void onDisabled()
     {
       Framework.disableAdProvider(Banner.Type.TYPE_RB);
+      MyTargetPrivacy.setUserConsent(false);
     }
 
     private void onEnabled()
diff --git a/android/src/com/mapswithme/util/statistics/MytargetHelper.java b/android/src/com/mapswithme/util/statistics/MytargetHelper.java
index 840bd148cb..1fa2023411 100644
--- a/android/src/com/mapswithme/util/statistics/MytargetHelper.java
+++ b/android/src/com/mapswithme/util/statistics/MytargetHelper.java
@@ -158,8 +158,19 @@ public final class MytargetHelper
       @Override
       public void onClick(NativeAppwallBanner nativeAppwallBanner, NativeAppwallAd nativeAppwallAd) {}
 
+
+
       @Override
-      public void onDismissDialog(NativeAppwallAd nativeAppwallAd) {}
+      public void onDisplay(@NonNull NativeAppwallAd nativeAppwallAd)
+      {
+
+      }
+
+      @Override
+      public void onDismiss(@NonNull NativeAppwallAd nativeAppwallAd)
+      {
+
+      }
     });
 
     res.load();