Merge pull request #10 from OpacityLabs/nero/SDK-194-ios-and-android-behavior-unification

unify behavior with iOS

Author: ospfranco

OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/InAppBrowserActivity.kt

@@ -46,7 +46,12 @@ class InAppBrowserActivity : AppCompatActivity() {
         override fun onReceive(context: Context?, intent: Intent?) {
             if (intent?.action == "com.opacitylabs.opacitycore.GET_COOKIES_FOR_DOMAIN") {
                 val receiver = intent.getParcelableExtra<CookieResultReceiver>("receiver")
-                val domain = intent.getStringExtra("domain")
+                var domain = intent.getStringExtra("domain")
+                if (domain?.startsWith(".") == true) {
+                    // If the domain starts with a dot, we have to remove it as per rfc 6265
+                    //  https://datatracker.ietf.org/doc/html/rfc6265#section-5.2.3
+                    domain = domain.substring(1)
+                }
                 val browserCookies = cookies[domain] ?: JSONObject()
                 receiver?.onReceiveResult(browserCookies)
             }
@@ -118,6 +123,9 @@ class InAppBrowserActivity : AppCompatActivity() {
                                 "html_body" -> {
                                     htmlBody = jsonMessage.getString("html")
                                     emitNavigationEvent()
+
+                                    // clear the html_body, needed so we stay consistent with iOS
+                                    htmlBody = ""
                                 }
 
                                 "cookies" -> {
@@ -168,6 +176,9 @@ class InAppBrowserActivity : AppCompatActivity() {
                         ): GeckoResult<AllowOrDeny>? {
                             currentUrl = request.uri
                             addToVisitedUrls(request.uri)
+
+                            emitNavigationEvent()
+
                             return super.onLoadRequest(session, request)
                         }
 
@@ -206,16 +217,26 @@ class InAppBrowserActivity : AppCompatActivity() {
     }
 
     private fun emitNavigationEvent() {
-        val domain = java.net.URL(currentUrl).host
-        val event: Map<String, Any?> =
-            mapOf(
+        val event: MutableMap<String, Any?> =
+            mutableMapOf(
                 "event" to "navigation",
                 "url" to currentUrl,
-                "html_body" to htmlBody,
-                "cookies" to cookies[domain],
                 "visited_urls" to visitedUrls,
                 "id" to System.currentTimeMillis().toString()
             )
+
+        try {
+            val domain = java.net.URL(currentUrl).host
+            event["cookies"] = cookies[domain]
+        } catch(e: Exception) {
+            // If the URL is malformed (usually when it is a URI like "uberlogin://blabla")
+            // we don't set any cookies
+        }
+
+        if (htmlBody != "") {
+            event["html_body"] = htmlBody
+        }
+
         OpacityCore.emitWebviewEvent(JSONObject(event).toString())
         clearVisitedUrls()
     }