Merge pull request #270 from THEOplayer/bugfix/android-hashmap

Bugfix/android hashmap

Author: tvanlaerhoven

.changeset/tiny-humans-repair.md

@@ -0,0 +1,6 @@
+---
+'@theoplayer/react-native-analytics-conviva': patch
+'@theoplayer/react-native-analytics-nielsen': patch
+---
+
+Fixed an issue where the connector would output a `HashMap` conversion build error for Android platforms.

conviva/android/src/main/java/com/theoplayerconviva/ReactTHEOplayerConvivaModule.kt

@@ -17,14 +17,10 @@ private const val PROP_GATEWAY_URL = "gatewayUrl"
 class ReactTHEOplayerConvivaModule(context: ReactApplicationContext) :
   ReactContextBaseJavaModule(context) {
 
-  private val viewResolver: ViewResolver
+  private val viewResolver: ViewResolver = ViewResolver(context)
 
   private var convivaConnectors: HashMap<Int, ConvivaConnector> = HashMap()
 
-  init {
-    viewResolver = ViewResolver(context)
-  }
-
   override fun getName(): String {
     return TAG
   }
@@ -48,11 +44,11 @@ class ReactTHEOplayerConvivaModule(context: ReactApplicationContext) :
             ConvivaConnector(
               reactApplicationContext,
               player,
-              convivaMetadata.toHashMap(),
+              convivaMetadata.toHashMap() as Map<String, Any>,
               config,
               view.broadcast as EventDispatcher<AdEvent<*>>
             )
-          convivaConnectors[tag]?.setContentInfo(convivaMetadata.toHashMap())
+          convivaConnectors[tag]?.setContentInfo(convivaMetadata.toHashMap() as Map<String, Any>)
         }
       }
     }
@@ -61,7 +57,7 @@ class ReactTHEOplayerConvivaModule(context: ReactApplicationContext) :
   @ReactMethod
   fun stopAndStartNewSession(tag: Int, convivaMetadata: ReadableMap) {
     viewResolver.resolveViewByTag(tag) { _: ReactTHEOplayerView? ->
-      convivaConnectors[tag]?.stopAndStartNewSession(convivaMetadata.toHashMap())
+      convivaConnectors[tag]?.stopAndStartNewSession(convivaMetadata.toHashMap() as Map<String, Any>)
     }
   }
 
@@ -75,21 +71,21 @@ class ReactTHEOplayerConvivaModule(context: ReactApplicationContext) :
   @ReactMethod
   fun reportPlaybackEvent(tag: Int, eventName: String, eventDetail: ReadableMap) {
     viewResolver.resolveViewByTag(tag) { _: ReactTHEOplayerView? ->
-      convivaConnectors[tag]?.reportPlaybackEvent(eventName, eventDetail.toHashMap())
+      convivaConnectors[tag]?.reportPlaybackEvent(eventName, eventDetail.toHashMap() as Map<String, Any>)
     }
   }
 
   @ReactMethod
   fun setContentInfo(tag: Int, convivaMetadata: ReadableMap) {
     viewResolver.resolveViewByTag(tag) { _: ReactTHEOplayerView? ->
-      convivaConnectors[tag]?.setContentInfo(convivaMetadata.toHashMap())
+      convivaConnectors[tag]?.setContentInfo(convivaMetadata.toHashMap() as Map<String, Any>)
     }
   }
 
   @ReactMethod
   fun setAdInfo(tag: Int, convivaMetadata: ReadableMap) {
     viewResolver.resolveViewByTag(tag) { _: ReactTHEOplayerView? ->
-      convivaConnectors[tag]?.setAdInfo(convivaMetadata.toHashMap())
+      convivaConnectors[tag]?.setAdInfo(convivaMetadata.toHashMap() as Map<String, Any>)
     }
   }
 

nielsen/android/src/main/java/com/theoplayernielsen/ReactTHEOplayerNielsenModule.kt

@@ -12,14 +12,10 @@ private const val TAG = "NielsenModule"
 class ReactTHEOplayerNielsenModule(context: ReactApplicationContext) :
   ReactContextBaseJavaModule(context) {
 
-  private val viewResolver: ViewResolver
+  private val viewResolver: ViewResolver = ViewResolver(context)
 
   private var nielsenConnectors: HashMap<Int, NielsenConnector> = HashMap()
 
-  init {
-    viewResolver = ViewResolver(context)
-  }
-
   override fun getName(): String {
     return TAG
   }
@@ -39,7 +35,7 @@ class ReactTHEOplayerNielsenModule(context: ReactApplicationContext) :
 
   @ReactMethod
   fun updateMetadata(tag: Int, metadata: ReadableMap) {
-    nielsenConnectors[tag]?.updateMetadata(metadata.toHashMap())
+    nielsenConnectors[tag]?.updateMetadata(metadata.toHashMap() as HashMap<String, Any>)
   }
 
   @ReactMethod