Remove close / onClose

Author: zoontek

android/src/main/java/io/swan/rnbrowser/RNSwanBrowserModuleImpl.kt

@@ -1,56 +1,35 @@
 package io.swan.rnbrowser
 
 import android.content.Intent
-import android.net.Uri
 
 import androidx.annotation.ColorInt
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
+import androidx.core.net.toUri
 
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 
 import io.swan.rnbrowser.helpers.CustomTabActivityHelper
 
 object RNSwanBrowserModuleImpl {
   const val NAME = "RNSwanBrowser"
-  private var browserVisible = false
-
-  internal fun onHostResume(reactContext: ReactApplicationContext) {
-    if (browserVisible && reactContext.hasActiveReactInstance()) {
-      browserVisible = false
-
-      reactContext
-        .getJSModule(RCTDeviceEventEmitter::class.java)
-        .emit("swanBrowserDidClose", null)
-    }
-  }
 
   internal fun open(
     reactContext: ReactApplicationContext,
     url: String,
     options: ReadableMap,
     promise: Promise
   ) {
-    if (browserVisible) {
-      return promise.reject(
-        "swan_browser_visible",
-        "An instance of the swan browser is already visible"
-      )
-    }
-
     val activity = reactContext.currentActivity
       ?: return promise.reject(
         "no_current_activity",
         "Couldn't call open() when the app is in background"
       )
 
-    browserVisible = true
-
     val intentBuilder = CustomTabsIntent.Builder().apply {
       setBookmarksButtonEnabled(false)
       setDownloadButtonEnabled(false)
@@ -95,7 +74,7 @@ object RNSwanBrowserModuleImpl {
     }
 
     CustomTabActivityHelper.openCustomTab(
-      activity, customTabsIntent, Uri.parse(url)
+      activity, customTabsIntent, url.toUri()
     ) { currentActivity, uri ->
       currentActivity.startActivity(Intent(Intent.ACTION_VIEW, uri))
     }

android/src/newarch/io/swan/rnbrowser/RNSwanBrowserModule.kt

@@ -1,49 +1,19 @@
 package io.swan.rnbrowser
 
-import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 
 @ReactModule(name = RNSwanBrowserModuleImpl.NAME)
 class RNSwanBrowserModule(reactContext: ReactApplicationContext) :
-  NativeRNSwanBrowserSpec(reactContext),
-  LifecycleEventListener {
-
-  init {
-    reactApplicationContext.addLifecycleEventListener(this)
-  }
-
-  override fun invalidate() {
-    reactApplicationContext.removeLifecycleEventListener(this)
-  }
+  NativeRNSwanBrowserSpec(reactContext) {
 
   override fun getName(): String {
     return RNSwanBrowserModuleImpl.NAME
   }
 
-  override fun onHostResume() {
-    RNSwanBrowserModuleImpl.onHostResume(reactApplicationContext)
-  }
-
-  override fun onHostPause() {}
-
-  override fun onHostDestroy() {}
-
   override fun open(url: String, options: ReadableMap, promise: Promise) {
     RNSwanBrowserModuleImpl.open(reactApplicationContext, url, options, promise)
   }
-
-  override fun close() {
-    // noop on Android since the modal is closed by deep-link
-  }
-
-  override fun addListener(eventName: String) {
-    // iOS only
-  }
-
-  override fun removeListeners(count: Double) {
-    // iOS only
-  }
 }

android/src/oldarch/io/swan/rnbrowser/RNSwanBrowserModule.kt

@@ -1,6 +1,5 @@
 package io.swan.rnbrowser
 
-import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -10,46 +9,14 @@ import com.facebook.react.module.annotations.ReactModule
 
 @ReactModule(name = RNSwanBrowserModuleImpl.NAME)
 class RNSwanBrowserModule(reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(reactContext),
-  LifecycleEventListener {
-
-  init {
-    reactApplicationContext.addLifecycleEventListener(this)
-  }
-
-  override fun invalidate() {
-    reactApplicationContext.removeLifecycleEventListener(this)
-  }
+  ReactContextBaseJavaModule(reactContext) {
 
   override fun getName(): String {
     return RNSwanBrowserModuleImpl.NAME
   }
 
-  override fun onHostResume() {
-    RNSwanBrowserModuleImpl.onHostResume(reactApplicationContext)
-  }
-
-  override fun onHostPause() {}
-
-  override fun onHostDestroy() {}
-
   @ReactMethod
   fun open(url: String, options: ReadableMap, promise: Promise) {
     RNSwanBrowserModuleImpl.open(reactApplicationContext, url, options, promise)
   }
-
-  @ReactMethod
-  fun close() {
-    // noop on Android since the modal is closed by deep-link
-  }
-
-  @ReactMethod
-  fun addListener(eventName: String) {
-    // iOS only
-  }
-
-  @ReactMethod
-  fun removeListeners(count: Double) {
-    // iOS only
-  }
 }