Merge branch 'develop' into feature/session-provider-listener

* develop: Allow `PlayKitManager.loadPlayer()` to accept null `PluginConfigs` (kaltura#184) FEM-1191: Offline and switch player fixes (kaltura#173)
thiemo--bleeken · Mar 20, 2017 · c1cb9d3 · c1cb9d3
2 parents 989dc7d + be5457c
commit c1cb9d3
Show file tree

Hide file tree

Showing 10 changed files with 281 additions and 149 deletions.
diff --git a/playkit/src/androidTest/java/com/kaltura/playkit/plugins/KalturaAnalyticsAndroidTest.java b/playkit/src/androidTest/java/com/kaltura/playkit/plugins/KalturaAnalyticsAndroidTest.java
@@ -8,11 +8,11 @@
 import com.kaltura.playkit.LogEvent;
 import com.kaltura.playkit.MessageBus;
 import com.kaltura.playkit.PKEvent;
+import com.kaltura.playkit.PKMediaConfig;
 import com.kaltura.playkit.PKMediaEntry;
 import com.kaltura.playkit.PKMediaSource;
 import com.kaltura.playkit.PlayKitManager;
 import com.kaltura.playkit.Player;
-import com.kaltura.playkit.PlayerConfig;
 import com.kaltura.playkit.PlayerEvent;
 
 import org.junit.Assert;
@@ -66,13 +66,13 @@ private void setPluginConfigObject(){
     }
 
     private void setMediaObject(){
-        PlayerConfig config = new PlayerConfig();
+        PKMediaConfig config = new PKMediaConfig();
         PKMediaSource mediaSource = new PKMediaSource().setUrl("http://cdnapi.kaltura.com/p/1774581/sp/177458100/playManifest/entryId/1_mphei4ku/format/applehttp/tags/mbr/protocol/http/f/a.m3u8");
         mediaSource.setId("516109");
         ArrayList<PKMediaSource> sourceList = new ArrayList<>();
         sourceList.add(mediaSource);
         PKMediaEntry mediaEntryProvider = new PKMediaEntry().setId(entryId).setDuration(duration).setSources(sourceList);
-        config.media.setMediaEntry(mediaEntryProvider);
+        config.setMediaEntry(mediaEntryProvider);
     }
 
     @Test

diff --git a/playkit/src/androidTest/java/com/kaltura/playkit/plugins/KalturaStatsAndroidTest.java b/playkit/src/androidTest/java/com/kaltura/playkit/plugins/KalturaStatsAndroidTest.java
@@ -8,10 +8,10 @@
 import com.kaltura.playkit.LogEvent;
 import com.kaltura.playkit.MessageBus;
 import com.kaltura.playkit.PKEvent;
+import com.kaltura.playkit.PKMediaConfig;
 import com.kaltura.playkit.PKMediaEntry;
 import com.kaltura.playkit.PKMediaSource;
 import com.kaltura.playkit.Player;
-import com.kaltura.playkit.PlayerConfig;
 import com.kaltura.playkit.PlayerEvent;
 
 import org.junit.Assert;
@@ -68,13 +68,13 @@ private void setPluginConfigObject(){
     }
 
     private void setMediaObject(){
-        PlayerConfig config = new PlayerConfig();
+        PKMediaConfig config = new PKMediaConfig();
         PKMediaSource mediaSource = new PKMediaSource().setUrl("http://cdnapi.kaltura.com/p/1774581/sp/177458100/playManifest/entryId/1_mphei4ku/format/applehttp/tags/mbr/protocol/http/f/a.m3u8");
         mediaSource.setId("516109");
         ArrayList<PKMediaSource> sourceList = new ArrayList<>();
         sourceList.add(mediaSource);
         PKMediaEntry mediaEntryProvider = new PKMediaEntry().setId(entryId).setDuration(duration).setSources(sourceList);
-        config.media.setMediaEntry(mediaEntryProvider);
+        config.setMediaEntry(mediaEntryProvider);
     }
 
     @Test

diff --git a/playkit/src/androidTest/java/com/kaltura/playkit/plugins/PhoenixTvpapiAndroidTest.java b/playkit/src/androidTest/java/com/kaltura/playkit/plugins/PhoenixTvpapiAndroidTest.java
@@ -8,10 +8,10 @@
 import com.kaltura.playkit.LogEvent;
 import com.kaltura.playkit.MessageBus;
 import com.kaltura.playkit.PKEvent;
+import com.kaltura.playkit.PKMediaConfig;
 import com.kaltura.playkit.PKMediaEntry;
 import com.kaltura.playkit.PKMediaSource;
 import com.kaltura.playkit.Player;
-import com.kaltura.playkit.PlayerConfig;
 import com.kaltura.playkit.PlayerEvent;
 
 import org.junit.Assert;
@@ -95,13 +95,13 @@ private void setPhoenixPluginConfig() {
     }
 
     private void setMediaObject() {
-        PlayerConfig config = new PlayerConfig();
+        PKMediaConfig config = new PKMediaConfig();
         PKMediaSource mediaSource = new PKMediaSource().setUrl("http://cdnapi.kaltura.com/p/1774581/sp/177458100/playManifest/entryId/1_mphei4ku/format/applehttp/tags/mbr/protocol/http/f/a.m3u8");
         mediaSource.setId("516109");
         ArrayList<PKMediaSource> sourceList = new ArrayList<>();
         sourceList.add(mediaSource);
         PKMediaEntry mediaEntryProvider = new PKMediaEntry().setId(entryId).setDuration(duration).setSources(sourceList);
-        config.media.setMediaEntry(mediaEntryProvider);
+        config.setMediaEntry(mediaEntryProvider);
     }
 
     @Test