Android 6.1.1 Release

* commit 'b609da9ffeee2c185b75c2c0c1b7f5fe3f0419c4':
  fixed typo
  6.1.1 Release changes
  MS-4079 Fix OMID GeometryChange
  Add Public API for SDK Version

Author: Kowshickkarthick Subramanian

RELEASE-NOTES.md

@@ -1,3 +1,10 @@
+## 6.1.1
+### New Features
++ MS-4019: Added new API to get SDK Version in SDKSettings.
+
+### Improvements/Bug Fixes
++ MS-4079: Fixed incorrect percentageInView when OMID geometryChange event is called.
+
 ## 6.1
 ### New Features
 + MS-4019: Added new API to Pause/Resume(https://wiki.xandr.com/display/sdk/Show+An+Instream+Video+Ad+on+Android) VideoAd

instreamvideo/build.gradle

@@ -1,5 +1,5 @@
 // Project Properties
-version = "1.13" // Instream SDK version
+version = "1.14" // Instream SDK version
 
 apply plugin: 'com.android.library'
 
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 28
-        versionCode 11 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
+        versionCode 12 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
         versionName version
         consumerProguardFiles 'proguard-project.txt'
     }

instreamvideo/src/main/java/com/appnexus/opensdk/instreamvideo/VideoWebView.java

@@ -69,6 +69,8 @@ class VideoWebView extends WebView {
     private boolean adIsPlaying = false;
     private boolean failed = false;
     private VideoRequestManager manager;
+    private static final int TOTAL_RETRY_TIMES = 10;
+    private static final int WAIT_INTERVAL_MILLES = 300;
 
     private int adDuration = 0;
     private String creativeId = "";
@@ -79,7 +81,6 @@ class VideoWebView extends WebView {
     private ANOmidAdSession omidAdSession;
 
     // Using handler posts the playAd() call to the end of queue and fixes initial rendering black issue on Lollipop and below simulators.
-    // And during resume Ad, this handler is used to retry until the parent window comes in focus else fail gracefully. Its observed parent window gets focus approx 200ms after the resume of activity.
     private Handler playAdHandler;
 
     public VideoWebView(Context context, VideoAd owner, VideoRequestManager manager) {
@@ -461,8 +462,30 @@ public void onReceiveValue(String s) {
 
 
     protected void playAd() {
-        adIsPlaying = true;
-        injectJavaScript("javascript:window.playAd()");
+        playAdHandler = new Handler();
+
+        Runnable runnableCode = new Runnable() {
+            int retryTimes = 0;
+
+            @Override
+            public void run() {
+                // Play the Ad if WindowFocus is true else retry after 300ms
+                if (hasWindowFocus()) {
+                    adIsPlaying = true;
+                    injectJavaScript("javascript:window.playAd()");
+                } else if (retryTimes < TOTAL_RETRY_TIMES) {
+                    Clog.i(Clog.videoLogTag, "Has no focus Retrying::" + retryTimes);
+                    retryTimes++;
+                    playAdHandler.postDelayed(this, WAIT_INTERVAL_MILLES);
+                } else {
+                    Clog.e(Clog.videoLogTag, "Failed to play Video-Ad giving up");
+                    owner.getAdDispatcher().onPlaybackError();
+                }
+            }
+        };
+
+        // There is no delay for first playAd() call
+        playAdHandler.post(runnableCode);
     }
 
 
@@ -473,8 +496,7 @@ protected void pauseAd(){
     protected void resumeAd() {
         // This is for resuming the playback after pause.
         if (adIsPlaying) {
-            // Just need to call playAd() again for resuming the ad, there is no seperate resumeAd() function in MobileVastPlayer
-            playAd();
+            injectJavaScript("javascript:window.playAd()");
         }
     }
 

sdk/build.gradle

@@ -1,5 +1,5 @@
 // Project properties
-version = "6.1"
+version = "6.1.1"
 group='com.appnexus.opensdk'
 
 // Android build
@@ -9,7 +9,7 @@ android {
     compileSdkVersion 28
     buildToolsVersion '29.0.0'
     defaultConfig {
-        versionCode 61 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
+        versionCode 62 // 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 9

sdk/src/com/appnexus/opensdk/SDKSettings.java

@@ -216,4 +216,12 @@ public static boolean isLocationEnabledForCreative(){
         return Settings.getSettings().locationEnabledForCreative;
     }
 
+
+    /**
+     * Returns AppNexus SDK Version
+     */
+    public static String getSDKVersion(){
+       return Settings.getSettings().sdkVersion;
+    }
+
 }

sdk/src/com/appnexus/opensdk/utils/Settings.java

@@ -45,7 +45,7 @@ public class Settings {
     public boolean debug_mode = false; // This should always be false here.
     public String ua = null;
 
-    public final String sdkVersion = "6.1";
+    public final String sdkVersion = "6.1.1";
 
     public String mcc;
     public String mnc;