diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2019-05-27 10:40:30 +0300 |
|---|---|---|
| committer | Aleksandr Zatsepin <alexzatsepin@users.noreply.github.com> | 2019-06-10 17:42:25 +0300 |
| commit | d5914cbce6a5abfa9795e3780f38a8c8e1ccef92 (patch) | |
| tree | 10c817dbd7734f6b8c3c3748cd661a15dbcf470f /android | |
| parent | c0719b452d727560ca2fefc4bcfbd461f8856d4a (diff) | |
[partners] Fixed local ads stats for hidden campaigns
Diffstat (limited to 'android')
3 files changed, 9 insertions, 3 deletions
diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java index 8f1b6ac55f..510bbb4b9d 100644 --- a/android/src/com/mapswithme/maps/Framework.java +++ b/android/src/com/mapswithme/maps/Framework.java @@ -197,7 +197,7 @@ public class Framework @NonNull MapObject mapObject) { LocalAdInfo info = mapObject.getLocalAdInfo(); - if (info == null || !info.isCustomer()) + if (info == null || (!info.isCustomer() && !info.isHidden())) return; Location location = LocationHelper.INSTANCE.getLastKnownLocation(); diff --git a/android/src/com/mapswithme/maps/ads/LocalAdInfo.java b/android/src/com/mapswithme/maps/ads/LocalAdInfo.java index bc81dc9baa..ab64050800 100644 --- a/android/src/com/mapswithme/maps/ads/LocalAdInfo.java +++ b/android/src/com/mapswithme/maps/ads/LocalAdInfo.java @@ -11,13 +11,14 @@ import java.lang.annotation.RetentionPolicy; public class LocalAdInfo implements Parcelable { @Retention(RetentionPolicy.SOURCE) - @IntDef({ STATUS_NOT_AVAILABLE, STATUS_CANDIDATE, STATUS_CUSTOMER}) + @IntDef({ STATUS_NOT_AVAILABLE, STATUS_CANDIDATE, STATUS_CUSTOMER, STATUS_HIDDEN}) public @interface Status {} private static final int STATUS_NOT_AVAILABLE = 0; private static final int STATUS_CANDIDATE = 1; private static final int STATUS_CUSTOMER = 2; + private static final int STATUS_HIDDEN = 3; @Status private final int mStatus; @@ -40,6 +41,11 @@ public class LocalAdInfo implements Parcelable return mStatus == STATUS_CUSTOMER; } + public boolean isHidden() + { + return mStatus == STATUS_HIDDEN; + } + @Nullable public String getUrl() { diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index eec1eab0bb..3c4773f674 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -1439,7 +1439,7 @@ public class PlacePageView extends NestedScrollView { LocalAdInfo localAdInfo = mapObject.getLocalAdInfo(); boolean isLocalAdAvailable = localAdInfo != null && localAdInfo.isAvailable(); - if (isLocalAdAvailable && !TextUtils.isEmpty(localAdInfo.getUrl())) + if (isLocalAdAvailable && !TextUtils.isEmpty(localAdInfo.getUrl()) && !localAdInfo.isHidden()) { mTvLocalAd.setText(localAdInfo.isCustomer() ? R.string.view_campaign_button : R.string.create_campaign_button); |