Merge pull request #5816 from alexzatsepin/master

[android] Cherry-picks on master

android/gradle.properties

@@ -4,8 +4,8 @@ propMinSdkVersion=15
 propTargetSdkVersion=22
 propCompileSdkVersion=23
 propBuildToolsVersion=25.0.2
-propVersionCode=723
-propVersionName=7.2.3
+propVersionCode=724
+propVersionName=7.2.4
 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
 org.gradle.daemon=true

android/src/com/mapswithme/maps/ads/FacebookNativeAd.java

@@ -57,6 +57,12 @@ class FacebookNativeAd extends CachedMwmNativeAd
     NativeAd.downloadAndDisplayImage(mAd.getAdIcon(), (ImageView) view);
   }
 
+  @Override
+  public void unregisterView()
+  {
+    mAd.unregisterView();
+  }
+
   @Override
   void registerViewForInteraction(@NonNull View view)
   {

android/src/com/mapswithme/maps/ads/MwmNativeAd.java

@@ -33,6 +33,11 @@ public interface MwmNativeAd
    */
   void registerView(@NonNull View bannerView);
 
+  /**
+   * Unregisters the view attached to the current ad.
+   */
+  void unregisterView();
+
   /**
    * Returns a provider name for this ad.
    */

android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java

@@ -64,6 +64,12 @@ class MyTargetNativeAd extends CachedMwmNativeAd
       NativeAd.loadImageToView(icon, (ImageView) view);
   }
 
+  @Override
+  public void unregisterView()
+  {
+    mAd.unregisterView();
+  }
+
   @Override
   void registerViewForInteraction(@NonNull View view)
   {

android/src/com/mapswithme/maps/widget/placepage/BannerController.java

@@ -143,7 +143,7 @@ final class BannerController
     if (mBanners != null && !mBanners.equals(banners))
     {
       onChangedVisibility(false);
-      mCurrentAd = null;
+      unregisterCurrentAd();
     }
 
     UiUtils.hide(mFrame);
@@ -162,6 +162,16 @@ final class BannerController
     updateVisibility();
   }
 
+  private void unregisterCurrentAd()
+  {
+    if (mCurrentAd != null)
+    {
+      LOGGER.d(TAG, "Unregister view for the ad: " + mCurrentAd.getTitle());
+      mCurrentAd.unregisterView();
+      mCurrentAd = null;
+    }
+  }
+
   boolean isBannerVisible()
   {
     return !UiUtils.isHidden(mFrame);
@@ -302,6 +312,8 @@ final class BannerController
       if (mBanners == null)
         return;
 
+      unregisterCurrentAd();
+
       mCurrentAd = ad;
 
       updateVisibility();