feat: Always have an initialContext (#19)

feat: Previously, if no initialContext no was passed to a portal, the web side of the portal would not have access to its name property. This change allows for the portal to have access to its name regardless of there being an initial value passed in or not.
ionic-team · Nov 7, 2022 · 60f0089 · 60f0089
1 parent 760b3cf
commit 60f0089
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/IonicPortals/src/main/kotlin/io/ionic/portals/PortalFragment.kt b/IonicPortals/src/main/kotlin/io/ionic/portals/PortalFragment.kt
@@ -192,24 +192,27 @@ open class PortalFragment : Fragment {
     }
 
     private fun setupInitialContextListener() {
-        val initialContext = this.initialContext ?: portal?.initialContext ?: return
-        val jsonObject: JSONObject = when (initialContext) {
-            is String -> {
-                try {
-                    JSONObject(initialContext)
-                } catch (ex: JSONException) {
+        val initialContext = this.initialContext ?: portal?.initialContext
+        val portalInitialContext = if (initialContext != null) {
+            val jsonObject: JSONObject = when (initialContext) {
+                is String -> {
+                    try {
+                        JSONObject(initialContext)
+                    } catch (ex: JSONException) {
+                        throw Error("initialContext must be a JSON string or a Map")
+                    }
+                }
+                is Map<*, *> -> {
+                    JSONObject(initialContext.toMap())
+                }
+                else -> {
                     throw Error("initialContext must be a JSON string or a Map")
                 }
             }
-            is Map<*, *> -> {
-                JSONObject(initialContext.toMap())
-            }
-            else -> {
-                throw Error("initialContext must be a JSON string or a Map")
-            }
+            "{ \"name\": \"" + portal?.name + "\"," + " \"value\": " + jsonObject.toString() + " } "
+        } else {
+            "{ \"name\": \"" + portal?.name + "\"" + " } "
         }
-        val portalInitialContext = "{ \"name\": \"" + portal?.name + "\"," +
-                " \"value\": " + jsonObject.toString() + " } "
 
         val newWebViewClient = object: BridgeWebViewClient(bridge) {
             override fun shouldInterceptRequest(