diff --git a/CHANGELOG.md b/CHANGELOG.md index c410092f8..0dc41e2fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## Version 3.6.1 (April 6, 2015) + + - **Bug Fix** Fixed a compile error in FacebookBanner.java + ## Version 3.6.0 (April 3, 2015) - **Facebook Update** Updated supported Facebook Audience Network version to 3.23.1 diff --git a/README.md b/README.md index c9282ba62..6786065bc 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,10 @@ Integration instructions are available on the [wiki](https://github.com/mopub/mo ## New in this Version Please view the [changelog](https://github.com/mopub/mopub-android-sdk/blob/master/CHANGELOG.md) for details. +### 3.6.1 +- **Bug Fix** Fixed a compile error in FacebookBanner.java +### 3.6.0 - **Facebook Update** Updated supported Facebook Audience Network version to 3.23.1 - **Bug fix** Fixed a bug where interstitials could leak memory; Fixes [issue #153](https://github.com/mopub/mopub-android-sdk/issues/153) - **VAST Video** Updated the VAST video player to support Progress events. diff --git a/mopub-sample/AndroidManifest.xml b/mopub-sample/AndroidManifest.xml index 0b8182ecb..d1458c0c5 100644 --- a/mopub-sample/AndroidManifest.xml +++ b/mopub-sample/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="23" + android:versionName="3.6.1"> diff --git a/mopub-sample/build.gradle b/mopub-sample/build.gradle index ed8a99723..369a62f98 100644 --- a/mopub-sample/build.gradle +++ b/mopub-sample/build.gradle @@ -13,8 +13,8 @@ android { buildToolsVersion '21.1.1' defaultConfig { - versionCode 22 - versionName "3.6.0" + versionCode 1 + versionName "3.6.1" minSdkVersion 9 targetSdkVersion 19 } diff --git a/mopub-sdk/build.gradle b/mopub-sdk/build.gradle index 644187f1c..111b0af86 100644 --- a/mopub-sdk/build.gradle +++ b/mopub-sdk/build.gradle @@ -15,8 +15,8 @@ android { buildToolsVersion '21.1.1' defaultConfig { - versionCode 22 - versionName "3.6.0" + versionCode 1 + versionName "3.6.1" minSdkVersion 9 targetSdkVersion 19 consumerProguardFiles 'proguard.txt' diff --git a/mopub-sdk/src/main/java/com/mopub/common/DataKeys.java b/mopub-sdk/src/main/java/com/mopub/common/DataKeys.java index 79b5d9b0f..b6f4ff06f 100644 --- a/mopub-sdk/src/main/java/com/mopub/common/DataKeys.java +++ b/mopub-sdk/src/main/java/com/mopub/common/DataKeys.java @@ -12,4 +12,6 @@ public class DataKeys { public static final String JSON_BODY_KEY = "com_mopub_native_json"; public static final String BROADCAST_IDENTIFIER_KEY = "broadcastIdentifier"; public static final String AD_UNIT_ID_KEY = "com_mopub_ad_unit_id"; + public static final String AD_WIDTH = "com_mopub_ad_width"; + public static final String AD_HEIGHT = "com_mopub_ad_height"; } diff --git a/mopub-sdk/src/main/java/com/mopub/common/MoPub.java b/mopub-sdk/src/main/java/com/mopub/common/MoPub.java index 9997b1814..29448af93 100644 --- a/mopub-sdk/src/main/java/com/mopub/common/MoPub.java +++ b/mopub-sdk/src/main/java/com/mopub/common/MoPub.java @@ -8,7 +8,7 @@ import com.mopub.mobileads.MoPubRewardedVideoManager; public class MoPub { - public static final String SDK_VERSION = "3.6.0"; + public static final String SDK_VERSION = "3.6.1"; public static enum LocationAwareness { NORMAL, TRUNCATED, DISABLED } diff --git a/mopub-sdk/src/main/java/com/mopub/mobileads/CustomEventBannerAdapter.java b/mopub-sdk/src/main/java/com/mopub/mobileads/CustomEventBannerAdapter.java index 2ff7a2cf4..bd9abaad5 100644 --- a/mopub-sdk/src/main/java/com/mopub/mobileads/CustomEventBannerAdapter.java +++ b/mopub-sdk/src/main/java/com/mopub/mobileads/CustomEventBannerAdapter.java @@ -16,7 +16,9 @@ import java.util.Map; import java.util.TreeMap; +import static com.mopub.common.DataKeys.AD_HEIGHT; import static com.mopub.common.DataKeys.AD_REPORT_KEY; +import static com.mopub.common.DataKeys.AD_WIDTH; import static com.mopub.common.DataKeys.BROADCAST_IDENTIFIER_KEY; import static com.mopub.mobileads.MoPubErrorCode.ADAPTER_NOT_FOUND; import static com.mopub.mobileads.MoPubErrorCode.NETWORK_TIMEOUT; @@ -71,6 +73,8 @@ public void run() { } mLocalExtras.put(BROADCAST_IDENTIFIER_KEY, broadcastIdentifier); mLocalExtras.put(AD_REPORT_KEY, adReport); + mLocalExtras.put(AD_WIDTH, mMoPubView.getAdWidth()); + mLocalExtras.put(AD_HEIGHT, mMoPubView.getAdHeight()); } void loadAd() { diff --git a/mopub-sdk/src/main/java/com/mopub/mobileads/MoPubRewardedVideoManager.java b/mopub-sdk/src/main/java/com/mopub/mobileads/MoPubRewardedVideoManager.java index 57d5d335d..2599cac5d 100644 --- a/mopub-sdk/src/main/java/com/mopub/mobileads/MoPubRewardedVideoManager.java +++ b/mopub-sdk/src/main/java/com/mopub/mobileads/MoPubRewardedVideoManager.java @@ -33,8 +33,6 @@ import java.util.Set; import java.util.TreeMap; -/** - */ public class MoPubRewardedVideoManager { private static MoPubRewardedVideoManager sInstance; private static final int DEFAULT_LOAD_TIMEOUT = Constants.THIRTY_SECONDS_MILLIS; diff --git a/mopub-sdk/src/test/java/com/mopub/mobileads/CustomEventBannerAdapterTest.java b/mopub-sdk/src/test/java/com/mopub/mobileads/CustomEventBannerAdapterTest.java index 6067d6dfe..884ac9a05 100644 --- a/mopub-sdk/src/test/java/com/mopub/mobileads/CustomEventBannerAdapterTest.java +++ b/mopub-sdk/src/test/java/com/mopub/mobileads/CustomEventBannerAdapterTest.java @@ -46,6 +46,7 @@ public class CustomEventBannerAdapterTest { private static final long BROADCAST_IDENTIFIER = 123; private Map serverExtras; private CustomEventBanner banner; + private Map localExtras; private Map expectedLocalExtras; private HashMap expectedServerExtras; @@ -53,6 +54,12 @@ public class CustomEventBannerAdapterTest { public void setUp() throws Exception { when(moPubView.getAdTimeoutDelay()).thenReturn(null); + when(moPubView.getAdWidth()).thenReturn(320); + when(moPubView.getAdHeight()).thenReturn(50); + + localExtras = new HashMap(); + when(moPubView.getLocalExtras()).thenReturn(localExtras); + serverExtras = new HashMap(); serverExtras.put("key", "value"); serverExtras.put("another_key", "another_value"); @@ -61,11 +68,20 @@ public void setUp() throws Exception { expectedLocalExtras = new HashMap(); expectedLocalExtras.put(DataKeys.AD_REPORT_KEY, mockAdReport); expectedLocalExtras.put("broadcastIdentifier", BROADCAST_IDENTIFIER); + expectedLocalExtras.put(DataKeys.AD_WIDTH, 320); + expectedLocalExtras.put(DataKeys.AD_HEIGHT, 50); + expectedServerExtras = new HashMap(); banner = CustomEventBannerFactory.create(CLASS_NAME); } + @Test + public void constructor_shouldPopulateLocalExtrasWithAdWidthAndHeight() throws Exception { + assertThat(localExtras.get("com_mopub_ad_width")).isEqualTo(320); + assertThat(localExtras.get("com_mopub_ad_height")).isEqualTo(50); + } + @Test public void timeout_shouldSignalFailureAndInvalidateWithDefaultDelay() throws Exception { subject.loadAd();