Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PLAYEROTT-42: ATV | Getting an error in Youbora Initialization found … #824

Closed
wants to merge 1 commit into from
+19 −5
Closed

PLAYEROTT-42: ATV | Getting an error in Youbora Initialization found … #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion playkit/src/main/java/com/kaltura/playkit/PKPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

package com.kaltura.playkit;

import android.app.Activity;
import android.content.Context;

public abstract class PKPlugin {
Expand All @@ -26,7 +27,7 @@ public interface Factory {
void warmUp(Context context);
}

protected abstract void onLoad(Player player, Object config, MessageBus messageBus, Context context);
protected abstract void onLoad(Player player, Object config, MessageBus messageBus, Context context, Activity playerActivity);

protected abstract void onUpdateMedia(PKMediaConfig mediaConfig);

Expand Down
11 changes: 11 additions & 0 deletions playkit/src/main/java/com/kaltura/playkit/PKPluginConfigs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
package com.kaltura.playkit;


import android.app.Activity;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
Expand All @@ -22,6 +24,7 @@
*/
public class PKPluginConfigs implements Iterable<Map.Entry<String, Object>> {

private Activity playerActivity;
private Map<String, Object> configs = new HashMap<>();

public Object getPluginConfig(String pluginName) {
Expand All @@ -39,4 +42,12 @@ public void setPluginConfig(String pluginName, Object settings) {
public Iterator<Map.Entry<String, Object>> iterator() {
return configs.entrySet().iterator();
}

public void setPlayerActivity(Activity playerActivity) {
this.playerActivity = playerActivity;
}

public Activity getPlayerActivity() {
return playerActivity;
}
}
7 changes: 4 additions & 3 deletions playkit/src/main/java/com/kaltura/playkit/PlayerLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

package com.kaltura.playkit;

import android.app.Activity;
import android.content.Context;
import android.net.Uri;
import android.text.TextUtils;
Expand Down Expand Up @@ -84,7 +85,7 @@ public void load(@NonNull PKPluginConfigs pluginsConfig) {

for (Map.Entry<String, Object> entry : pluginsConfig) {
String name = entry.getKey();
PKPlugin plugin = loadPlugin(name, player, entry.getValue(), messageBus, context);
PKPlugin plugin = loadPlugin(name, player, entry.getValue(), messageBus, context, pluginsConfig.getPlayerActivity());

if (plugin == null) {
log.w("Plugin not found: " + name);
Expand Down Expand Up @@ -281,10 +282,10 @@ private Pair<Integer, String> getRequiredAnalyticsInfo(PKMediaConfig pkMediaConf
return Pair.create(kavaPartnerId, kavaEntryId);
}

private PKPlugin loadPlugin(String name, Player player, Object config, MessageBus messageBus, Context context) {
private PKPlugin loadPlugin(String name, Player player, Object config, MessageBus messageBus, Context context, Activity playerActivity) {
PKPlugin plugin = PlayKitManager.createPlugin(name);
if (plugin != null) {
plugin.onLoad(player, config, messageBus, context);
plugin.onLoad(player, config, messageBus, context, playerActivity);
}
return plugin;
}
Expand Down
3 changes: 2 additions & 1 deletion playkit/src/main/java/com/kaltura/playkit/plugins/SamplePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

package com.kaltura.playkit.plugins;

import android.app.Activity;
import android.content.Context;

import com.google.gson.JsonObject;
Expand Down Expand Up @@ -60,7 +61,7 @@ public void warmUp(Context context) {
};

@Override
protected void onLoad(Player player, Object config, final MessageBus messageBus, Context context) {
protected void onLoad(Player player, Object config, final MessageBus messageBus, Context context, Activity playerActivity) {
log.i("Loading");
this.player = player;
this.context = context;
Expand Down