v2.1.0 (#65)

* expose CustomerViewData in proguard, and allow it to be updated * save * almost there * Fixed code to comply with automated tests. * Fixed some review issues. * Fixed soft dependency. * try additional requirement * version file * Fixed non ads crash, fixed pause after seeking, fixed viewstart not dispatched. * Reinstated necessary callback. * small cleanup * v2.1.0 Co-authored-by: Tomislav Kordic <[email protected]>
muxinc · Dec 7, 2020 · 019f7df · 019f7df
1 parent 5c155ed
commit 019f7df
Show file tree

Hide file tree

Showing 92 changed files with 13,168 additions and 86 deletions.
diff --git a/MuxExoPlayer/build.gradle b/MuxExoPlayer/build.gradle
@@ -6,7 +6,7 @@ android {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
         versionCode 9
-        versionName "1.5.0"
+        versionName "2.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -45,6 +45,12 @@ android {
         r2_11_1_ads {
             java.srcDirs = ['./src/r2_11_1/java']
         }
+        r2_12_1 {
+            java.srcDirs = ['./src/r2_12_1/java']
+        }
+        r2_12_1_ads {
+            java.srcDirs = ['./src/r2_12_1/java']
+        }
     }
 
     flavorDimensions 'api'
@@ -68,6 +74,12 @@ android {
         r2_11_1_ads {
             dimension 'api'
         }
+        r2_12_1 {
+            dimension 'api'
+        }
+        r2_12_1_ads {
+            dimension 'api'
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_7
@@ -106,7 +118,12 @@ dependencies {
     r2_11_1Api 'org.checkerframework:checker-qual:2.5.2'
     r2_11_1_adsApi 'com.google.android.exoplayer:exoplayer:2.11.1'
     r2_11_1_adsApi 'org.checkerframework:checker-qual:2.5.2'
+    r2_12_1Api 'com.google.android.exoplayer:exoplayer:2.12.1'
+    r2_12_1Api 'org.checkerframework:checker-qual:2.5.2'
+    r2_12_1_adsApi 'com.google.android.exoplayer:exoplayer:2.12.1'
+    r2_12_1_adsApi 'org.checkerframework:checker-qual:2.5.2'
     compileOnly 'com.google.ads.interactivemedia.v3:interactivemedia:3.9.0'
     compileOnly 'com.google.android.gms:play-services-ads:15.0.1'
+    compileOnly 'com.google.android.gms:play-services-ads-identifier:17.0.0'
     api files('libs/MuxCore.jar')
 }
diff --git a/MuxExoPlayer/libs/MuxCore.jar b/MuxExoPlayer/libs/MuxCore.jar
diff --git a/MuxExoPlayer/libs/version-v5.0.0 b/MuxExoPlayer/libs/version-v5.0.0
diff --git a/MuxExoPlayer/libs/version-v6.0.0 b/MuxExoPlayer/libs/version-v6.0.0
@@ -0,0 +1 @@
+v6.0.0
diff --git a/MuxExoPlayer/proguard-rules.pro b/MuxExoPlayer/proguard-rules.pro
@@ -23,4 +23,7 @@
 -keep public class com.mux.stats.sdk.muxstats.MuxErrorException { public protected *; }
 -keep public class com.mux.stats.sdk.core.model.CustomerPlayerData { public protected *; }
 -keep public class com.mux.stats.sdk.core.model.CustomerVideoData { public protected *; }
+-keep public class com.mux.stats.sdk.core.model.CustomerViewData { public protected *; }
 -keep public class com.mux.stats.sdk.core.MuxSDKViewOrientation { public protected *; }
+
+-repackageclasses com.mux.stats.sdk
diff --git a/MuxExoPlayer/src/main/java/com/mux/stats/sdk/muxstats/AdsImaSDKListener.java b/MuxExoPlayer/src/main/java/com/mux/stats/sdk/muxstats/AdsImaSDKListener.java
@@ -91,9 +91,11 @@ public void onAdEvent(AdEvent adEvent) {
                     // End the ad break, and then toggle playback state to ensure that
                     // we get a play/playing after the ads.
                     dispatchAdPlaybackEvent(new AdBreakEndEvent(null), ad);
-                    exoPlayerListener.player.get().setPlayWhenReady(false);
-                    exoPlayerListener.setState(MuxBaseExoPlayer.PlayerState.FINISHED_PLAYING_ADS);
-                    exoPlayerListener.player.get().setPlayWhenReady(true);
+                    if (exoPlayerListener.player != null && exoPlayerListener.player.get() != null) {
+                        exoPlayerListener.player.get().setPlayWhenReady(false);
+                        exoPlayerListener.setState(MuxBaseExoPlayer.PlayerState.FINISHED_PLAYING_ADS);
+                        exoPlayerListener.player.get().setPlayWhenReady(true);
+                    }
                     break;
                 case PAUSED:
                     dispatchAdPlaybackEvent(new AdPauseEvent(null), ad);