map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix cancel banner loading

Browse source
This commit is contained in:
Roman Romanov 2017-04-27 09:53:35 +04:00 • committed by r.kuznetsov
parent 646582b366
commit 4118341282
3 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java
View file

@ -71,6 +71,12 @@ abstract class CachingNativeAdLoader extends BaseNativeAdLoader
}
}
@Override
public void cancel(@NonNull String bannerId)
{
PENDING_REQUESTS.remove(new BannerKey(getProvider(), bannerId));
}
private boolean isImpressionGood(@NonNull CachedMwmNativeAd ad)
{
return mTracker != null && mTracker.isImpressionGood(ad.getProvider(), ad.getBannerId());

25
android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java
View file

@ -9,9 +9,10 @@ import com.mapswithme.util.concurrency.UiThread;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
@ -30,7 +31,7 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native
private static final String TAG = CompoundNativeAdLoader.class.getSimpleName();
private static final int TIMEOUT_MS = 5000;
@NonNull
private final List<NativeAdLoader> mLoaders = new ArrayList<>();
private final Map<String, NativeAdLoader> mLoaders = new HashMap<>();
@Nullable
private final OnAdCacheModifiedListener mCacheListener;
@Nullable
@ -55,7 +56,7 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native
public void loadAd(@NonNull Context context, @NonNull List<Banner> banners)
{
LOGGER.i(TAG, "Load ads for " + banners);
cancelLoaders();
cancelLoaders(banners);
mLoadingCompleted = false;
mFailedProviders.clear();
@ -68,7 +69,7 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native
throw new AssertionError("A banner id mustn't be empty!");
NativeAdLoader loader = Factory.createLoaderForBanner(banner, mCacheListener, mAdTracker);
mLoaders.add(loader);
mLoaders.put(banner.getProvider(), loader);
loader.setAdListener(this);
loader.loadAd(context, banner.getId());
}
@ -86,6 +87,12 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native
throw new UnsupportedOperationException("A compound loader doesn't support this operation!");
}
@Override
public void cancel(@NonNull String bannerId)
{
throw new UnsupportedOperationException("A compound loader doesn't support this operation!");
}
public boolean isAdLoading()
{
return !mLoadingCompleted;
@ -169,9 +176,15 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native
mLoadingCompleted = true;
}
private void cancelLoaders()
private void cancelLoaders(@NonNull List<Banner> banners)
{
for (NativeAdLoader adLoader : mLoaders)
for (Banner banner : banners)
{
NativeAdLoader loader = mLoaders.get(banner.getProvider());
if (loader != null)
loader.cancel(banner.getId());
}
for (NativeAdLoader adLoader : mLoaders.values())
adLoader.setAdListener(null);
mLoaders.clear();
}

7
android/src/com/mapswithme/maps/ads/NativeAdLoader.java
View file

@ -29,4 +29,11 @@ public interface NativeAdLoader
* @return <code>true</code> if loading is in a progress, otherwise - <code>false</code>.
*/
boolean isAdLoading(@NonNull String bannerId);
/**
* Cancel the loading of a specific banner
*
* @param bannerId A specified banner id.
*/
void cancel(@NonNull String bannerId);
}