Pull request #708: Release branch v8.6.1

Merge in MOBILE-SDK/app_mobile-sdk-android from release_branch_v8.6.1 to master * commit 'd3765cd4d5111fbd9842a814070dd1b61c322f29': (26 commits) release version 8.6.1 change sdk version release version 8.6.1 handled index out of bound exception jenkins test mediation changes and code clean uncommenting mediation classes UTAdResponse changes UTAd Responses test changes merged develop branch conflict commenting sdk settings for testing purpose native ad changes commenting mediation classes mediatition native ad working mediated timedout test working changes test unit case instream build roboelectric changes sdk build revert changes roboelectric lib changes revert instream build changes ...
appnexus · Jun 7, 2023 · 334c821 · 334c821
2 parents 26cf8d0 + d3765cd
commit 334c821
Show file tree

Hide file tree

Showing 47 changed files with 620 additions and 549 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,8 @@
+## 8.6.1
+
+### Improvement/Bug Fixes
++ MS-5321 Fixed ArrayIndexOutOfBoundsException in XandrAd.init()
+
 ## 8.6
 
 ### Improvement/Bug Fixes

diff --git a/instreamvideo/build.gradle b/instreamvideo/build.gradle
@@ -1,5 +1,5 @@
 // Project Properties
-version = "1.44" // Instream SDK version
+version = "1.45" // Instream SDK version
 
 apply plugin: 'com.android.library'
 
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 32
-        versionCode 43 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
+        versionCode 44 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
         versionName version
         consumerProguardFiles 'proguard-project.txt'
     }
@@ -134,4 +134,4 @@ repositories {
     }
     jcenter()
     mavenCentral()
-}
+}
diff --git a/...eamvideo/src/test/java/com/appnexus/opensdk/instreamvideo/ANAdResponseInfoVideoTests.java b/...eamvideo/src/test/java/com/appnexus/opensdk/instreamvideo/ANAdResponseInfoVideoTests.java
@@ -24,7 +24,6 @@
 import com.appnexus.opensdk.instreamvideo.shadows.ShadowSettings;
 import com.appnexus.opensdk.instreamvideo.shadows.ShadowWebSettings;
 import com.appnexus.opensdk.ut.UTConstants;
-import com.squareup.okhttp.mockwebserver.MockResponse;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,9 +59,10 @@ public void tearDown() {
         adResponseInfo = null;
     }
 
+    //test
     @Test
     public void testAdResponseInfoRTBVideo() {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video())); // First queue a regular HTML banner response
+        server.setDispatcher(getDispatcher(TestUTResponses.video())); // First queue a regular HTML banner response
         assertNull(videoAd.getAdResponseInfo());
         executeVideoRequest();
         assertNotNull(videoAd.getAdResponseInfo());
@@ -80,7 +80,7 @@ public void testAdResponseInfoRTBVideo() {
 
     @Test
     public void testAdResponseInfoRTBVideoNoBid() {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.NO_BID));
+        server.setDispatcher(getDispatcher(TestUTResponses.NO_BID));
         assertNull(videoAd.getAdResponseInfo());
         executeVideoRequest();
         assertNotNull(videoAd.getAdResponseInfo());
@@ -99,7 +99,7 @@ public void testAdResponseInfoRTBVideoNoBid() {
 
     @Test
     public void testAdResponseInfoRTBVideoBlank() {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.blank()));
+        server.setDispatcher(getDispatcher(TestUTResponses.blank()));
         assertNull(videoAd.getAdResponseInfo());
         executeVideoRequest();
         assertNull(videoAd.getAdResponseInfo());

diff --git a/instreamvideo/src/test/java/com/appnexus/opensdk/instreamvideo/BaseRoboTest.java b/instreamvideo/src/test/java/com/appnexus/opensdk/instreamvideo/BaseRoboTest.java
@@ -1,15 +1,15 @@
 package com.appnexus.opensdk.instreamvideo;
 
 import android.app.Activity;
-
-
-import com.appnexus.opensdk.ANAdResponseInfo;
 import com.appnexus.opensdk.XandrAd;
 import com.appnexus.opensdk.instreamvideo.shadows.ShadowSettings;
 import com.appnexus.opensdk.instreamvideo.util.Lock;
 import com.appnexus.opensdk.ut.UTConstants;
 import com.squareup.okhttp.HttpUrl;
+import com.squareup.okhttp.mockwebserver.Dispatcher;
+import com.squareup.okhttp.mockwebserver.MockResponse;
 import com.squareup.okhttp.mockwebserver.MockWebServer;
+import com.squareup.okhttp.mockwebserver.RecordedRequest;
 
 import org.junit.After;
 import org.junit.Before;
@@ -23,6 +23,8 @@
 
 import static org.robolectric.Shadows.shadowOf;
 
+import androidx.annotation.NonNull;
+
 public class BaseRoboTest {
     public static final int placementID = 1;
     public static final int width = 320;
@@ -89,4 +91,18 @@ public void waitForTasks() {
         scheduleTimerToCheckForTasks();
         Lock.pause();
     }
+
+    /**
+     *creates a mock web server dispatcher with prerecorded requests and responses
+     **/
+    public Dispatcher getDispatcher(final String response) {
+        return new Dispatcher() {
+            @NonNull
+            @Override
+            public MockResponse dispatch(@NonNull RecordedRequest request) {
+                return new MockResponse().setResponseCode(200)
+                        .setBody(response);
+            }
+        };
+    }
 }
diff --git a/instreamvideo/src/test/java/com/appnexus/opensdk/instreamvideo/TestANClickThroughAction.java b/instreamvideo/src/test/java/com/appnexus/opensdk/instreamvideo/TestANClickThroughAction.java
@@ -22,7 +22,6 @@
 import com.appnexus.opensdk.instreamvideo.shadows.ShadowCustomClickThroughWebView;
 import com.appnexus.opensdk.instreamvideo.shadows.ShadowSettings;
 import com.appnexus.opensdk.instreamvideo.shadows.ShadowWebSettings;
-import com.squareup.okhttp.mockwebserver.MockResponse;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,7 +59,7 @@ public void tearDown() {
     @Test
     public void testVideoANClickThroughActionReturnURL() {
         videoAd.setClickThroughAction(ANClickThroughAction.RETURN_URL);
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video())); // First queue a regular HTML banner response
+        server.setDispatcher(getDispatcher(TestUTResponses.video())); // First queue a regular HTML banner response
         executeVideoRequest();
         waitForTasks();
         Robolectric.flushBackgroundThreadScheduler();
@@ -73,7 +72,7 @@ public void testVideoANClickThroughActionReturnURL() {
     @Test
     public void testVideoANClickThroughActionSDKBrowser() {
         videoAd.setClickThroughAction(ANClickThroughAction.OPEN_SDK_BROWSER);
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video())); // First queue a regular HTML banner response
+        server.setDispatcher(getDispatcher(TestUTResponses.video())); // First queue a regular HTML banner response
         executeVideoRequest();
 
         waitForTasks();
@@ -87,7 +86,7 @@ public void testVideoANClickThroughActionSDKBrowser() {
     @Test
     public void testVideoANClickThroughActionDeviceBrowser() {
         videoAd.setClickThroughAction(ANClickThroughAction.OPEN_DEVICE_BROWSER);
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video())); // First queue a regular HTML banner response
+        server.setDispatcher(getDispatcher(TestUTResponses.video())); // First queue a regular HTML banner response
         executeVideoRequest();
 
         waitForTasks();

diff --git a/...ideo/src/test/java/com/appnexus/opensdk/instreamvideo/VideoAdFriendlyObstructionTest.java b/...ideo/src/test/java/com/appnexus/opensdk/instreamvideo/VideoAdFriendlyObstructionTest.java
@@ -24,7 +24,6 @@
 import com.appnexus.opensdk.instreamvideo.shadows.ShadowSettings;
 import com.appnexus.opensdk.instreamvideo.shadows.ShadowWebSettings;
 import com.appnexus.opensdk.instreamvideo.util.Lock;
-import com.squareup.okhttp.mockwebserver.MockResponse;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -63,7 +62,7 @@ public void tearDown(){
 
     @Test
     public void testBannerAddFriendlyObstruction() {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video())); // First queue a regular HTML banner response
+        server.setDispatcher(getDispatcher(TestUTResponses.video())); // First queue a regular HTML banner response
         assertFriendlyObstruction(videoAd, 0);
         SDKSettings.setOMEnabled(true);
         View v1 = new View(activity);
@@ -78,7 +77,7 @@ public void testBannerAddFriendlyObstruction() {
 
     @Test
     public void testBannerAddAndRemoveFriendlyObstruction() {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video())); // First queue a regular HTML banner response
+        server.setDispatcher(getDispatcher(TestUTResponses.video())); // First queue a regular HTML banner response
         assertFriendlyObstruction(videoAd, 0);
         SDKSettings.setOMEnabled(true);
         View v1 = new View(activity);
@@ -97,7 +96,7 @@ public void testBannerAddAndRemoveFriendlyObstruction() {
 
     @Test
     public void testBannerAddAndRemoveAllFriendlyObstruction() {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video())); // First queue a regular HTML banner response
+        server.setDispatcher(getDispatcher(TestUTResponses.video())); // First queue a regular HTML banner response
         assertFriendlyObstruction(videoAd, 0);
         SDKSettings.setOMEnabled(true);
         View v1 = new View(activity);

diff --git a/instreamvideo/src/test/java/com/appnexus/opensdk/instreamvideo/VideoAdTest.java b/instreamvideo/src/test/java/com/appnexus/opensdk/instreamvideo/VideoAdTest.java
@@ -25,7 +25,6 @@
 import com.appnexus.opensdk.instreamvideo.util.Lock;
 import com.appnexus.opensdk.instreamvideo.util.TestUtil;
 import com.appnexus.opensdk.utils.Clog;
-import com.squareup.okhttp.mockwebserver.MockResponse;
 
 import junit.framework.Assert;
 
@@ -78,7 +77,7 @@ public void testVideoDuration() throws Exception {
     @Test
     public void testGetVideoOrientationPortrait() throws Exception {
         ShadowCustomWebView.aspectRatio = "0.5625"; // 9:16
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);
@@ -97,7 +96,7 @@ public void testGetVideoOrientationPortrait() throws Exception {
     @Test
     public void testGetVideoOrientationLandscape() throws Exception {
         ShadowCustomWebView.aspectRatio = "1.7778"; // 16:9
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);
@@ -116,7 +115,7 @@ public void testGetVideoOrientationLandscape() throws Exception {
     @Test
     public void testGetVideoOrientationSquare() throws Exception {
         ShadowCustomWebView.aspectRatio = "1";
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);
@@ -135,7 +134,7 @@ public void testGetVideoOrientationSquare() throws Exception {
     @Test
     public void testGetVideoOrientationUnknown() throws Exception {
         ShadowCustomWebView.aspectRatio = "";
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);
@@ -154,7 +153,7 @@ public void testGetVideoOrientationUnknown() throws Exception {
 
     @Test
     public void testGetCreativeURL() throws Exception {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);
@@ -173,7 +172,7 @@ public void testGetCreativeURL() throws Exception {
 
     @Test
     public void testGetVideoAdDuration() throws Exception {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);
@@ -191,7 +190,7 @@ public void testGetVideoAdDuration() throws Exception {
 
     @Test
     public void testGetVastXML() throws Exception {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);
@@ -209,7 +208,7 @@ public void testGetVastXML() throws Exception {
 
     @Test
     public void testGetVastURL() throws Exception {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);
@@ -227,7 +226,7 @@ public void testGetVastURL() throws Exception {
 
     @Test
     public void testAdPlayStarted() throws Exception {
-        server.enqueue(new MockResponse().setResponseCode(200).setBody(TestUTResponses.video()));
+        server.setDispatcher(getDispatcher(TestUTResponses.video()));
 
         videoAd.loadAd();
         Lock.pause(1000);

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -1,5 +1,5 @@
 // Project properties
-version = "8.6"
+version = "8.6.1"
 group='com.appnexus.opensdk'
 
 // Android build
@@ -10,7 +10,7 @@ android {
     buildToolsVersion '32.0.0'
 
     defaultConfig {
-        versionCode 102 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
+        versionCode 103 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
         versionName version
         consumerProguardFiles 'proguard-project.txt'
         minSdkVersion 14

diff --git a/sdk/src/com/appnexus/opensdk/XandrAd.java b/sdk/src/com/appnexus/opensdk/XandrAd.java
@@ -21,16 +21,15 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.provider.CalendarContract;
-
 import com.appnexus.opensdk.tasksmanager.TasksManager;
 import com.appnexus.opensdk.utils.Clog;
 import com.appnexus.opensdk.utils.HTTPGet;
 import com.appnexus.opensdk.utils.HTTPResponse;
 import com.appnexus.opensdk.utils.Settings;
 import org.json.JSONArray;
 import org.json.JSONException;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * This class holds the responsibility of caching the memberId and memberId list,
@@ -45,7 +44,7 @@ public class XandrAd {
     /**
      * Cached member IDs list
      * */
-    private static List<Integer> cachedViewableImpressionMemberIds = new ArrayList<>();
+    private static List<Integer> cachedViewableImpressionMemberIds = new CopyOnWriteArrayList<>();
     /**
      * Viewable Impression Config URL
      * */
@@ -133,6 +132,8 @@ protected void onPostExecute(HTTPResponse response) {
                             }
                         } catch (JSONException e) {
                             Clog.e(Clog.baseLogTag, Clog.getString(R.string.fetch_viewable_impression_member_id_error));
+                        } catch (ArrayIndexOutOfBoundsException boundsException) {
+                            Clog.e(Clog.baseLogTag, Clog.getString(R.string.fetch_viewable_impression_member_id_error));
                         }
                     }
 

diff --git a/sdk/src/com/appnexus/opensdk/utils/Settings.java b/sdk/src/com/appnexus/opensdk/utils/Settings.java
@@ -68,8 +68,8 @@ public enum ImpressionType {
     public boolean debug_mode = false; // This should always be false here.
     public String ua = null;
 
-    public final String sdkVersion = "8.6";
-//            BuildConfig.VERSION_NAME;
+    public final String sdkVersion = "8.6.1";
+//      BuildConfig.VERSION_NAME;
 
 
     public String mcc;