Merge pull request #11 from OpacityLabs/nero/SDK-199-ios-android-cookie-behavior-unification

unify cookie fetch behavior between ios and android

Author: ospfranco

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

@@ -228,7 +228,7 @@ class InAppBrowserActivity : AppCompatActivity() {
         try {
             val domain = java.net.URL(currentUrl).host
             event["cookies"] = cookies[domain]
-        } catch(e: Exception) {
+        } catch (e: Exception) {
             // If the URL is malformed (usually when it is a URI like "uberlogin://blabla")
             // we don't set any cookies
         }
@@ -266,5 +266,6 @@ class InAppBrowserActivity : AppCompatActivity() {
         LocalBroadcastManager.getInstance(this)
             .unregisterReceiver(cookiesForCurrentURLRequestReceiver)
         geckoSession.close()
+        OpacityCore.onBrowserDestroyed()
     }
 }

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

@@ -26,6 +26,7 @@ object OpacityCore {
     private lateinit var _url: String
     private var headers: Bundle = Bundle()
     private lateinit var sRuntime: GeckoRuntime
+    private var isBrowserActive = false
 
     init {
         System.loadLibrary("OpacityCore")
@@ -73,40 +74,49 @@ object OpacityCore {
     }
 
     fun presentBrowser() {
-        val intent = Intent()
-        intent.setClassName(
-            appContext.packageName,
-            "com.opacitylabs.opacitycore.InAppBrowserActivity"
-        )
+        val intent = Intent(appContext, InAppBrowserActivity::class.java)
         intent.putExtra("url", _url)
         intent.putExtra("headers", headers)
         appContext.startActivity(intent)
+        isBrowserActive = true
     }
 
-    fun getBrowserCookiesForCurrentUrl(): String {
+    fun getBrowserCookiesForCurrentUrl(): String? {
+        if (!isBrowserActive) {
+            return null
+        }
+
         val cookiesIntent = Intent("com.opacitylabs.opacitycore.GET_COOKIES_FOR_CURRENT_URL")
         val resultReceiver = CookieResultReceiver()
         cookiesIntent.putExtra("receiver", resultReceiver)
         LocalBroadcastManager.getInstance(appContext).sendBroadcast(cookiesIntent)
         val json = resultReceiver.waitForResult(1000) // Wait up to 1 second for the result
-        return json.toString()
+        return json?.toString()
     }
 
-    fun getBrowserCookiesForDomain(domain: String): String {
+    fun getBrowserCookiesForDomain(domain: String): String? {
+        if (!isBrowserActive) {
+            return null
+        }
+
         val cookiesIntent = Intent("com.opacitylabs.opacitycore.GET_COOKIES_FOR_DOMAIN")
         val resultsReceiver = CookieResultReceiver()
         cookiesIntent.putExtra("receiver", resultsReceiver)
         cookiesIntent.putExtra("domain", domain)
         LocalBroadcastManager.getInstance(appContext).sendBroadcast(cookiesIntent)
         val json = resultsReceiver.waitForResult(1000)
-        return json.toString()
+        return json?.toString()
     }
 
     fun closeBrowser() {
         val closeIntent = Intent("com.opacitylabs.opacitycore.CLOSE_BROWSER")
         LocalBroadcastManager.getInstance(appContext).sendBroadcast(closeIntent)
     }
 
+    fun onBrowserDestroyed() {
+        isBrowserActive = false
+    }
+
     private fun parseOpacityError(error: String?): OpacityError {
         if (error == null) {
             return OpacityError("UnknownError", "No Message")