Release: version 3.3.0

dbautist · Dec 8, 2014 · b3f695f · b3f695f
1 parent 3a5f76e
commit b3f695f
Show file tree

Hide file tree

Showing 217 changed files with 9,732 additions and 6,294 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -27,7 +27,11 @@ Integration instructions are available on the [wiki](https://github.com/mopub/mo
 
 Please view the [changelog](https://github.com/mopub/mopub-android-sdk/blob/master/CHANGELOG.md) for details.
 
-  - **Bug Fixes**
+  - **MRAID 2.0 Support** - The MoPub SDK is now compliant with the MRAID 2.0 specification to enable rich media ads in banners and interstitial ad units. Learn more about MRAID from the [IAB](http://www.iab.net/MRAID#MRAID).
+  - **Location Polling Updates** - Changed the interaction between application- and device-provided location data: more recent location data is now always used (in the past, application-provided location data was always preferred).
+
+    As before, you may still disable MoPub SDK's location polling by calling `MoPub.setLocationAwareness(LocationAwareness.DISABLED)`.
+  - **Updated Chartboost SDK** Updated the `ChartboostInterstitial` custom event to support Chartboost SDK 5.0.4
 
 ## Requirements
 

diff --git a/build.gradle b/build.gradle
@@ -4,11 +4,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.1+'
-        classpath 'org.robolectric:robolectric-gradle-plugin:0.12.+'
+        classpath 'com.android.tools.build:gradle:0.14.2+'
     }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.12'
+    gradleVersion = '2.1'
 }
diff --git a/extras/src/com/mopub/mobileads/ChartboostInterstitial.java b/extras/src/com/mopub/mobileads/ChartboostInterstitial.java
@@ -3,13 +3,18 @@
 import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
+
 import com.chartboost.sdk.Chartboost;
 import com.chartboost.sdk.ChartboostDelegate;
+import com.mopub.common.VisibleForTesting;
+
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import static com.chartboost.sdk.Model.CBError.CBImpressionError;
 
 /*
- * Tested with Chartboost SDK 3.1.5.
+ * Tested with Chartboost SDK 5.0.4.
  */
 class ChartboostInterstitial extends CustomEventInterstitial {
     /*
@@ -37,11 +42,6 @@ static SingletonChartboostDelegate getDelegate() {
         return SingletonChartboostDelegate.instance;
     }
 
-    @Deprecated // for test only
-    public static void resetDelegate() {
-        SingletonChartboostDelegate.instance = new SingletonChartboostDelegate();
-    }
-
     /*
      * Abstract methods from CustomEventInterstitial
      */
@@ -53,9 +53,6 @@ protected void loadInterstitial(Context context, CustomEventInterstitialListener
             return;
         }
 
-        Activity activity = (Activity) context;
-        Chartboost chartboost = Chartboost.sharedChartboost();
-
         if (extrasAreValid(serverExtras)) {
             setAppId(serverExtras.get(APP_ID_KEY));
             setAppSignature(serverExtras.get(APP_SIGNATURE_KEY));
@@ -68,23 +65,29 @@ protected void loadInterstitial(Context context, CustomEventInterstitialListener
             return;
         }
 
+        Activity activity = (Activity) context;
+        Chartboost.startWithAppId(activity, appId, appSignature);
+
         if (getDelegate().hasLocation(location) &&
                 getDelegate().getListener(location) != interstitialListener) {
             interstitialListener.onInterstitialFailed(MoPubErrorCode.ADAPTER_CONFIGURATION_ERROR);
             return;
         }
 
         getDelegate().registerListener(location, interstitialListener);
-        chartboost.onCreate(activity, appId, appSignature, getDelegate());
-        chartboost.onStart(activity);
-
-        chartboost.cacheInterstitial(location);
+        Chartboost.setDelegate(getDelegate());
+        Chartboost.setAutoCacheAds(false);
+        Chartboost.setShouldRequestInterstitialsInFirstSession(true);
+        Chartboost.setShouldDisplayLoadingViewForMoreApps(false);
+        Chartboost.onCreate(activity);
+        Chartboost.onStart(activity);
+        Chartboost.cacheInterstitial(location);
     }
 
     @Override
     protected void showInterstitial() {
         Log.d("MoPub", "Showing Chartboost interstitial ad.");
-        Chartboost.sharedChartboost().showInterstitial(location);
+        Chartboost.showInterstitial(location);
     }
 
     @Override
@@ -108,7 +111,8 @@ private boolean extrasAreValid(Map<String, String> serverExtras) {
         return serverExtras.containsKey(APP_ID_KEY) && serverExtras.containsKey(APP_SIGNATURE_KEY);
     }
 
-    private static class SingletonChartboostDelegate implements ChartboostDelegate {
+    @VisibleForTesting
+    static class SingletonChartboostDelegate extends ChartboostDelegate {
         private static final CustomEventInterstitialListener NULL_LISTENER = new CustomEventInterstitialListener() {
             @Override public void onInterstitialLoaded() { }
             @Override public void onInterstitialFailed(MoPubErrorCode errorCode) { }
@@ -146,20 +150,15 @@ public boolean shouldRequestInterstitial(String location) {
             return true;
         }
 
-        @Override
-        public boolean shouldRequestInterstitialsInFirstSession() {
-            return true;
-        }
-
         @Override
         public void didCacheInterstitial(String location) {
             Log.d("MoPub", "Chartboost interstitial loaded successfully.");
             getListener(location).onInterstitialLoaded();
         }
 
         @Override
-        public void didFailToLoadInterstitial(String location) {
-            Log.d("MoPub", "Chartboost interstitial ad failed to load.");
+        public void didFailToLoadInterstitial(String location, CBImpressionError error) {
+            Log.d("MoPub", "Chartboost interstitial ad failed to load. Error: " + error.name());
             getListener(location).onInterstitialFailed(MoPubErrorCode.NETWORK_NO_FILL);
         }
 
@@ -181,7 +180,7 @@ public void didClickInterstitial(String location) {
         }
 
         @Override
-        public void didShowInterstitial(String location) {
+        public void didDisplayInterstitial(String location) {
             Log.d("MoPub", "Chartboost interstitial ad shown.");
             getListener(location).onInterstitialShown();
         }
@@ -190,47 +189,45 @@ public void didShowInterstitial(String location) {
          * More Apps delegate methods
          */
         @Override
-        public boolean shouldDisplayLoadingViewForMoreApps() {
+        public boolean shouldRequestMoreApps(String location) {
             return false;
         }
 
         @Override
-        public boolean shouldRequestMoreApps() {
+        public boolean shouldDisplayMoreApps(String location) {
             return false;
         }
 
         @Override
-        public boolean shouldDisplayMoreApps() {
-            return false;
+        public void didFailToLoadMoreApps(String location, CBImpressionError error) {
         }
 
         @Override
-        public void didFailToLoadMoreApps() {
+        public void didCacheMoreApps(String location) {
         }
 
         @Override
-        public void didCacheMoreApps() {
+        public void didDismissMoreApps(String location) {
         }
 
         @Override
-        public void didDismissMoreApps() {
+        public void didCloseMoreApps(String location) {
         }
 
         @Override
-        public void didCloseMoreApps() {
-        }
-
-        @Override
-        public void didClickMoreApps() {
-        }
-
-        @Override
-        public void didShowMoreApps() {
+        public void didClickMoreApps(String location) {
         }
 
         CustomEventInterstitialListener getListener(String location) {
             CustomEventInterstitialListener listener = listenerForLocation.get(location);
             return listener != null ? listener : NULL_LISTENER;
         }
     }
+
+    @VisibleForTesting
+    @Deprecated
+    public static void resetDelegate() {
+        SingletonChartboostDelegate.instance = new SingletonChartboostDelegate();
+    }
+
 }
diff --git a/...com/mopub/mobileads/GreystripeBanner.java → ...mopub/simpleadsdemo/GreystripeBanner.java b/...com/mopub/mobileads/GreystripeBanner.java → ...mopub/simpleadsdemo/GreystripeBanner.java
@@ -11,7 +11,7 @@
 import com.mopub.mobileads.CustomEventBanner;
 import com.mopub.mobileads.MoPubErrorCode;
 
-import java.util.*;
+import java.util.Map;
 
 /*
  * Tested with Greystripe SDK 2.4.0.

diff --git a/...pub/mobileads/GreystripeInterstitial.java → ...simpleadsdemo/GreystripeInterstitial.java b/...pub/mobileads/GreystripeInterstitial.java → ...simpleadsdemo/GreystripeInterstitial.java
@@ -11,7 +11,7 @@
 import com.mopub.mobileads.CustomEventInterstitial;
 import com.mopub.mobileads.MoPubErrorCode;
 
-import java.util.*;
+import java.util.Map;
 
 /*
  * Tested with Greystripe SDK 2.4.0.

diff --git a/...src/com/mopub/mobileads/InMobiBanner.java → ...com/mopub/simpleadsdemo/InMobiBanner.java b/...src/com/mopub/mobileads/InMobiBanner.java → ...com/mopub/simpleadsdemo/InMobiBanner.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+
 import com.inmobi.commons.InMobi;
 import com.inmobi.commons.InMobi.LOG_LEVEL;
 import com.inmobi.monetization.IMBanner;
@@ -12,7 +13,8 @@
 import com.mopub.mobileads.CustomEventBanner;
 import com.mopub.mobileads.MoPubErrorCode;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /*
  * Tested with InMobi SDK 4.4.1

diff --git a/...m/mopub/mobileads/InMobiInterstitial.java → ...pub/simpleadsdemo/InMobiInterstitial.java b/...m/mopub/mobileads/InMobiInterstitial.java → ...pub/simpleadsdemo/InMobiInterstitial.java
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 05 14:58:07 PDT 2014
+#Tue Nov 18 14:15:01 PST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
diff --git a/mopub-sample/AndroidManifest.xml b/mopub-sample/AndroidManifest.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.mopub.simpleadsdemo"
-      android:versionCode="18"
-      android:versionName="3.2.2">
+      android:versionCode="19"
+      android:versionName="3.3.0">
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="19"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+
     <!-- For MRAID 2 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name">
 	    <activity android:name="com.mopub.simpleadsdemo.MoPubSampleActivity"
 	            android:label="@string/app_name"
-                android:configChanges="orientation">
+                android:configChanges="orientation|screenSize">
 	        <intent-filter>
 	            <action android:name="android.intent.action.MAIN" />
 	            <category android:name="android.intent.category.LAUNCHER" />
 	        </intent-filter>
 	    </activity>
         <activity android:name="com.mopub.mobileads.MoPubActivity"
-                android:configChanges="keyboardHidden|orientation"/>
+                android:configChanges="keyboardHidden|orientation|screenSize"/>
         <activity android:name="com.mopub.mobileads.MraidActivity"
-                android:configChanges="keyboardHidden|orientation"/>
+                android:configChanges="keyboardHidden|orientation|screenSize"/>
         <activity android:name="com.mopub.common.MoPubBrowser"
-                android:configChanges="keyboardHidden|orientation"/>
+                android:configChanges="keyboardHidden|orientation|screenSize"/>
         <activity android:name="com.mopub.mobileads.MraidVideoPlayerActivity"
-                android:configChanges="keyboardHidden|orientation"/>
+                android:configChanges="keyboardHidden|orientation|screenSize"/>
 
         <meta-data android:name="com.google.android.gms.version"
                    android:value="@integer/google_play_services_version" />
-
     </application>
 
 </manifest>
diff --git a/mopub-sample/build.gradle b/mopub-sample/build.gradle
@@ -6,15 +6,26 @@ description = '''MoPub SDK'''
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    buildToolsVersion '21.1.1'
 
     defaultConfig {
         versionCode 1
-        versionName "3.2.1"
+        versionName "3.3.0"
         minSdkVersion 9
         targetSdkVersion 19
     }
 
+    buildTypes {
+      release {
+        minifyEnabled true
+        proguardFiles = [getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg']
+      }
+      debug {
+        minifyEnabled true
+        proguardFiles = [getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg']
+      }
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

diff --git a/mopub-sample/proguard.cfg b/mopub-sample/proguard.cfg
@@ -15,4 +15,4 @@
 # Support for Android Advertiser ID.
 -keep class com.google.android.gms.common.GooglePlayServicesUtil {*;}
 -keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {*;}
-
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {*;}
diff --git a/mopub-sample/src/main/java/com/mopub/simpleadsdemo/NativeGalleryFragment.java b/mopub-sample/src/main/java/com/mopub/simpleadsdemo/NativeGalleryFragment.java
@@ -13,7 +13,6 @@
 import android.widget.TextView;
 
 import com.mopub.nativeads.MoPubNativeAdLoadedListener;
-import com.mopub.nativeads.MoPubNativeAdPositioning;
 import com.mopub.nativeads.MoPubNativeAdRenderer;
 import com.mopub.nativeads.MoPubStreamAdPlacer;
 import com.mopub.nativeads.RequestParameters;
@@ -69,12 +68,9 @@ public void onClick(View view) {
         views.mDescriptionView.setText(mAdConfiguration.getDescription());
         views.mAdUnitIdView.setText(adUnitId);
         mViewPager = (ViewPager) view.findViewById(R.id.gallery_pager);
-        mStreamAdPlacer = new MoPubStreamAdPlacer(getActivity(),
-                MoPubNativeAdPositioning.clientPositioning()
-                        .addFixedPosition(4)
-                        .addFixedPosition(1)
-                        .enableRepeatingPositions(3)
-        );
+
+        // This ad placer is used to automatically insert ads into the ViewPager.
+        mStreamAdPlacer = new MoPubStreamAdPlacer(getActivity());
         final MoPubNativeAdRenderer adRenderer = new MoPubNativeAdRenderer(
                 new ViewBinder.Builder(R.layout.native_ad_list_item)
                         .titleId(R.id.native_title)

diff --git a/mopub-sample/src/main/java/com/mopub/simpleadsdemo/NativeListViewFragment.java b/mopub-sample/src/main/java/com/mopub/simpleadsdemo/NativeListViewFragment.java
@@ -10,7 +10,6 @@
 import android.widget.ListView;
 
 import com.mopub.nativeads.MoPubAdAdapter;
-import com.mopub.nativeads.MoPubNativeAdPositioning;
 import com.mopub.nativeads.MoPubNativeAdRenderer;
 import com.mopub.nativeads.RequestParameters;
 import com.mopub.nativeads.ViewBinder;
@@ -69,12 +68,9 @@ public void onClick(View view) {
             adapter.add("Item " + i);
         }
 
-        // Create an ad adapter with ads in positions 0, 4, and every 10 places thereafter.
+        // Create an ad adapter that gets its positioning information from the MoPub Ad Server.
         // This adapter will be used in place of the original adapter for the ListView.
-        mAdAdapter = new MoPubAdAdapter(getActivity(), adapter, MoPubNativeAdPositioning.clientPositioning()
-                .addFixedPosition(0)
-                .addFixedPosition(4)
-                .enableRepeatingPositions(10));
+        mAdAdapter = new MoPubAdAdapter(getActivity(), adapter);
 
         // Set up an renderer that knows how to put ad data in an ad view.
         final MoPubNativeAdRenderer adRenderer = new MoPubNativeAdRenderer(

diff --git a/mopub-sample/src/test/resources/org.robolectric.Config.properties b/mopub-sample/src/test/resources/org.robolectric.Config.properties
@@ -0,0 +1 @@
+shadows=com.mopub.nativeads.test.support.MoPubShadowDisplay,com.mopub.nativeads.test.support.MoPubShadowBitmap
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		shadows=com.mopub.nativeads.test.support.MoPubShadowDisplay,com.mopub.nativeads.test.support.MoPubShadowBitmap