AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed review notes

Browse source
This commit is contained in:
alexzatsepin 2017-03-28 20:48:52 +03:00 • committed by Vladimir Byko-Ianko
parent 692b0591cc
commit 0ab9df1db5
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/ads/DefaultAdTracker.java
View file

@ -125,6 +125,10 @@ public class DefaultAdTracker implements AdTracker, OnAdCacheModifiedListener
LOGGER.d(TAG, "it's a last time for this ad");
return;
}
if (mTimestamp == 0)
throw new AssertionError("A timestamp mustn't be 0 when ad is hidden!");
mShowTime += SystemClock.elapsedRealtime() - mTimestamp;
LOGGER.d(TAG, "A show time = " + mShowTime);
mTimestamp = 0;

10
android/src/com/mapswithme/maps/ads/FacebookAdsLoader.java
View file

@ -41,8 +41,8 @@ class FacebookAdsLoader extends BaseNativeAdLoader implements AdListener
}
/**
* Loads an ad for a specified banner id. If there is a cached ad, and it's not expired,
* the caller will be notified immediately through {@link NativeAdListener#onAdLoaded(MwmNativeAd)}.
* Loads an ad for a specified banner id. If there is a cached ad, the caller will be notified
* immediately through {@link NativeAdListener#onAdLoaded(MwmNativeAd)}.
* Otherwise, the caller will be notified once an ad is loaded through the mentioned method.
*
* <br><br><b>Important note: </b> if there is a cached ad for the requested banner id, and that ad
@ -55,7 +55,7 @@ class FacebookAdsLoader extends BaseNativeAdLoader implements AdListener
{
LOGGER.d(TAG, "Load a facebook ad for a banner id '" + bannerId + "'");
FacebookNativeAd cachedAd = CACHE.get(bannerId);
FacebookNativeAd cachedAd = getAdByIdFromCache(bannerId);
if (cachedAd == null)
{
@ -100,8 +100,8 @@ class FacebookAdsLoader extends BaseNativeAdLoader implements AdListener
@Override
public void onError(Ad ad, AdError adError)
{
LOGGER.w(TAG, "A error '" + adError + "' is occurred while loading an ad for banner id " +
"'" + ad.getPlacementId() + "'");
LOGGER.w(TAG, "A error '" + adError.getErrorMessage() + "' is occurred while loading " +
"an ad for banner id '" + ad.getPlacementId() + "'");
PENDING_REQUESTS.remove(ad.getPlacementId());
if (getAdListener() != null)
getAdListener().onError(new FacebookNativeAd((NativeAd)ad), new FacebookAdError(adError));

6
android/src/com/mapswithme/maps/widget/placepage/BannerController.java
View file

@ -295,11 +295,11 @@ final class BannerController
if (mBanner == null || TextUtils.isEmpty(mBanner.getId()))
return;
boolean isCacheEmpty = mCurrentAd != null;
setErrorStatus(isCacheEmpty);
boolean isNotCached = mCurrentAd == null;
setErrorStatus(isNotCached);
updateVisibility();
if (mListener != null && isCacheEmpty)
if (mListener != null && isNotCached)
mListener.onSizeChanged();
Statistics.INSTANCE.trackNativeAdError(mBanner.getId(), ad, error, mOpened ? 1 : 0);