From f89ff18dc3c97a8a1025bcb0e6e5ff28282e0f69 Mon Sep 17 00:00:00 2001
From: Volodymyr Bondarenko <volodymyr.bondarenko@kaltura.com>
Date: Thu, 6 Feb 2025 12:01:19 +0200
Subject: [PATCH] PLAYEROTT-42: ATV | Getting an error in Youbora
 Initialization found on 4.28.6

---
 .../src/main/java/com/kaltura/playkit/PKPlugin.java   |  3 ++-
 .../java/com/kaltura/playkit/PKPluginConfigs.java     | 11 +++++++++++
 .../main/java/com/kaltura/playkit/PlayerLoader.java   |  7 ++++---
 .../com/kaltura/playkit/plugins/SamplePlugin.java     |  3 ++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/playkit/src/main/java/com/kaltura/playkit/PKPlugin.java b/playkit/src/main/java/com/kaltura/playkit/PKPlugin.java
index bdd11d381..af26596b6 100644
--- a/playkit/src/main/java/com/kaltura/playkit/PKPlugin.java
+++ b/playkit/src/main/java/com/kaltura/playkit/PKPlugin.java
@@ -12,6 +12,7 @@
 
 package com.kaltura.playkit;
 
+import android.app.Activity;
 import android.content.Context;
 
 public abstract class PKPlugin {
@@ -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);
 
diff --git a/playkit/src/main/java/com/kaltura/playkit/PKPluginConfigs.java b/playkit/src/main/java/com/kaltura/playkit/PKPluginConfigs.java
index 4ceb65d13..25d17202f 100644
--- a/playkit/src/main/java/com/kaltura/playkit/PKPluginConfigs.java
+++ b/playkit/src/main/java/com/kaltura/playkit/PKPluginConfigs.java
@@ -13,6 +13,8 @@
 package com.kaltura.playkit;
 
 
+import android.app.Activity;
+
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -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) {
@@ -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;
+    }
 }
diff --git a/playkit/src/main/java/com/kaltura/playkit/PlayerLoader.java b/playkit/src/main/java/com/kaltura/playkit/PlayerLoader.java
index 4f55c24f3..6bc1d17dc 100644
--- a/playkit/src/main/java/com/kaltura/playkit/PlayerLoader.java
+++ b/playkit/src/main/java/com/kaltura/playkit/PlayerLoader.java
@@ -12,6 +12,7 @@
 
 package com.kaltura.playkit;
 
+import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -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);
@@ -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;
     }
diff --git a/playkit/src/main/java/com/kaltura/playkit/plugins/SamplePlugin.java b/playkit/src/main/java/com/kaltura/playkit/plugins/SamplePlugin.java
index 1ec05f822..3585725fb 100644
--- a/playkit/src/main/java/com/kaltura/playkit/plugins/SamplePlugin.java
+++ b/playkit/src/main/java/com/kaltura/playkit/plugins/SamplePlugin.java
@@ -12,6 +12,7 @@
 
 package com.kaltura.playkit.plugins;
 
+import android.app.Activity;
 import android.content.Context;
 
 import com.google.gson.JsonObject;
@@ -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;