diff --git a/ThirdPartyAdapters/adcolony/CHANGELOG.md b/ThirdPartyAdapters/adcolony/CHANGELOG.md index 302b2cf70..fccbb557b 100644 --- a/ThirdPartyAdapters/adcolony/CHANGELOG.md +++ b/ThirdPartyAdapters/adcolony/CHANGELOG.md @@ -1,5 +1,9 @@ # AdColony Adapter for Google Mobile Ads SDK for Android Changelog +## 3.1.2.0 +- Fixed possible NullPointerExceptions. +- Verified compatibility with AdColony SDK version 3.1.2. + ## 3.1.1.0 - Verified compatibility with AdColony SDK version 3.1.1. diff --git a/ThirdPartyAdapters/adcolony/README.md b/ThirdPartyAdapters/adcolony/README.md index 33c40bbaf..0f6849f31 100644 --- a/ThirdPartyAdapters/adcolony/README.md +++ b/ThirdPartyAdapters/adcolony/README.md @@ -12,7 +12,7 @@ SDK in Google Play services. - Add the compile dependency with the latest version of the AdColony adapter in the *build.gradle* file:
dependencies {
-    compile 'com.google.ads.mediation:adcolony:3.1.1.0'
+    compile 'com.google.ads.mediation:adcolony:3.1.2.0'
   }
   
- To add AdColony to your mediation layer, you will need to create an app on the diff --git a/ThirdPartyAdapters/adcolony/adcolony/build.gradle b/ThirdPartyAdapters/adcolony/adcolony/build.gradle index 5cc9ee0d9..5f34818f1 100644 --- a/ThirdPartyAdapters/adcolony/adcolony/build.gradle +++ b/ThirdPartyAdapters/adcolony/adcolony/build.gradle @@ -9,7 +9,7 @@ apply plugin: 'maven-publish' */ ext { // String property to store version name. - stringVersion = "3.1.1.0" + stringVersion = "3.1.2.0" // String property to store group id. stringGroupId = "com.google.ads.mediation" // String property used to set the name of the Jar created by makeJar task. @@ -43,7 +43,7 @@ android { } dependencies { - provided 'com.adcolony:sdk:3.1.1' + provided 'com.adcolony:sdk:3.1.2' provided 'com.google.android.gms:play-services-ads:10.2.0' } diff --git a/ThirdPartyAdapters/adcolony/adcolony/src/main/java/com/jirbo/adcolony/AdColonyAdListener.java b/ThirdPartyAdapters/adcolony/adcolony/src/main/java/com/jirbo/adcolony/AdColonyAdListener.java index 5ec06d3d6..13c2d447b 100644 --- a/ThirdPartyAdapters/adcolony/adcolony/src/main/java/com/jirbo/adcolony/AdColonyAdListener.java +++ b/ThirdPartyAdapters/adcolony/adcolony/src/main/java/com/jirbo/adcolony/AdColonyAdListener.java @@ -19,8 +19,7 @@ class AdColonyAdListener extends AdColonyInterstitialListener implements AdColon private AdColonyAdapter _adapter; private boolean _rewarded; - AdColonyAdListener(AdColonyAdapter adapter, MediationInterstitialListener listener) - { + AdColonyAdListener(AdColonyAdapter adapter, MediationInterstitialListener listener) { _mediationInterstitialListener = listener; _adapter = adapter; } @@ -33,83 +32,102 @@ class AdColonyAdListener extends AdColonyInterstitialListener implements AdColon @Override public void onRequestFilled(AdColonyInterstitial ad) { - _adapter.setAd(ad); - if (_rewarded) { - _mediationRewardedVideoAdListener.onAdLoaded(_adapter); - } else { - _mediationInterstitialListener.onAdLoaded(_adapter); + if (_adapter != null) { + _adapter.setAd(ad); + if (_rewarded) { + _mediationRewardedVideoAdListener.onAdLoaded(_adapter); + } else { + _mediationInterstitialListener.onAdLoaded(_adapter); + } } } @Override public void onClicked(AdColonyInterstitial ad) { - _adapter.setAd(ad); - if (_rewarded) { - _mediationRewardedVideoAdListener.onAdClicked(_adapter); - } else { - _mediationInterstitialListener.onAdClicked(_adapter); + if (_adapter != null) { + _adapter.setAd(ad); + if (_rewarded) { + _mediationRewardedVideoAdListener.onAdClicked(_adapter); + } else { + _mediationInterstitialListener.onAdClicked(_adapter); + } } } @Override public void onClosed(AdColonyInterstitial ad) { - _adapter.setAd(ad); - if (_rewarded) { - _mediationRewardedVideoAdListener.onAdClosed(_adapter); - } else { - _mediationInterstitialListener.onAdClosed(_adapter); + if (_adapter != null) { + _adapter.setAd(ad); + if (_rewarded) { + _mediationRewardedVideoAdListener.onAdClosed(_adapter); + } else { + _mediationInterstitialListener.onAdClosed(_adapter); + } } } @Override public void onExpiring(AdColonyInterstitial ad) { - _adapter.setAd(ad); - AdColony.requestInterstitial(ad.getZoneID(), this); + if (_adapter != null) { + _adapter.setAd(ad); + AdColony.requestInterstitial(ad.getZoneID(), this); + } } @Override public void onIAPEvent(AdColonyInterstitial ad, String productId, int engagementType) { - _adapter.setAd(ad); + if (_adapter != null) { + _adapter.setAd(ad); + } } @Override public void onLeftApplication(AdColonyInterstitial ad) { - _adapter.setAd(ad); - if (_rewarded) { - _mediationRewardedVideoAdListener.onAdLeftApplication(_adapter); - } else { - _mediationInterstitialListener.onAdLeftApplication(_adapter); + if (_adapter != null) { + _adapter.setAd(ad); + if (_rewarded) { + _mediationRewardedVideoAdListener.onAdLeftApplication(_adapter); + } else { + _mediationInterstitialListener.onAdLeftApplication(_adapter); + } } } @Override public void onOpened(AdColonyInterstitial ad) { - _adapter.setAd(ad); - if (_rewarded) { - _mediationRewardedVideoAdListener.onAdOpened(_adapter); - _mediationRewardedVideoAdListener.onVideoStarted(_adapter); - } else { - _mediationInterstitialListener.onAdOpened(_adapter); + if (_adapter != null) { + _adapter.setAd(ad); + if (_rewarded) { + _mediationRewardedVideoAdListener.onAdOpened(_adapter); + _mediationRewardedVideoAdListener.onVideoStarted(_adapter); + } else { + _mediationInterstitialListener.onAdOpened(_adapter); + } } } @Override public void onRequestNotFilled(AdColonyZone zone) { - _adapter.setAd(null); - if (_rewarded) { - AdColony.removeRewardListener(); - _mediationRewardedVideoAdListener. - onAdFailedToLoad(_adapter, AdRequest.ERROR_CODE_NO_FILL); - } else { - _mediationInterstitialListener.onAdFailedToLoad(_adapter, AdRequest.ERROR_CODE_NO_FILL); + if (_adapter != null) { + _adapter.setAd(null); + if (_rewarded) { + AdColony.removeRewardListener(); + _mediationRewardedVideoAdListener + .onAdFailedToLoad(_adapter, AdRequest.ERROR_CODE_NO_FILL); + } else { + _mediationInterstitialListener + .onAdFailedToLoad(_adapter, AdRequest.ERROR_CODE_NO_FILL); + } } } @Override public void onReward(com.adcolony.sdk.AdColonyReward reward) { - AdColonyReward adReward = - new AdColonyReward(reward.getRewardName(), reward.getRewardAmount()); - _mediationRewardedVideoAdListener.onRewarded(_adapter, adReward); + if (_adapter != null) { + AdColonyReward adReward = + new AdColonyReward(reward.getRewardName(), reward.getRewardAmount()); + _mediationRewardedVideoAdListener.onRewarded(_adapter, adReward); + } } void destroy() {