undo android expo updates from gaurav

Author: chaitanyapotti

…vewebbrowser/InternalActicityProvider.kt …vewebbrowser/InternalActivityProvider.ktandroid/src/main/java/com/reactnativewebbrowser/InternalActicityProvider.kt renamed to android/src/main/java/com/reactnativewebbrowser/InternalActivityProvider.kt android/src/main/java/com/reactnativewebbrowser/InternalActicityProvider.kt renamed to android/src/main/java/com/reactnativewebbrowser/InternalActivityProvider.kt

@@ -8,116 +8,99 @@ import android.net.Uri
 import androidx.browser.customtabs.CustomTabsClient
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.browser.customtabs.CustomTabsService
-import com.reactnativewebbrowser.error.CurrentActivityNotFoundException
-import com.reactnativewebbrowser.error.PackageManagerNotFoundException
 import java.util.ArrayList
+import java.util.Collections
 import java.util.LinkedHashSet
 
-private const val DUMMY_URL = "https://web3auth.io"
-
-class InternalCustomTabsActivitiesHelper(
-  private val activityProvider: ActivityProvider?
-) {
 
-  // region Actual custom tabs activities helper methods
+import androidx.browser.customtabs.CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION
+import com.reactnativewebbrowser.error.CurrentActivityNotFoundException
+import com.reactnativewebbrowser.error.PackageManagerNotFoundException
 
-  /**
-   * @throws CurrentActivityNotFoundException
-   * @throws PackageManagerNotFoundException
-   */
-  fun canResolveIntent(intent: Intent): Boolean = getResolvingActivities(intent).isNotEmpty()
+class InternalCustomTabsActivitiesHelper(val activityProvider: ActivityProvider) :
+  CustomTabsActivitiesHelper {
 
-  /**
-   * @throws PackageManagerNotFoundException
-   * @throws CurrentActivityNotFoundException
-   */
-  val customTabsResolvingActivities: ArrayList<String>
-    get() = getResolvingActivities(createDefaultCustomTabsIntent())
-      .mapToDistinctArrayList { resolveInfo: ResolveInfo ->
-        resolveInfo.activityInfo.packageName
-      }
+  override val customTabsResolvingActivities: ArrayList<String>
+    get() = mapCollectionToDistinctArrayList(
+      getResolvingActivities(
+        createDefaultCustomTabsIntent()
+      )
+    ) { resolveInfo -> resolveInfo.activityInfo.packageName }
 
-  /**
-   * @throws PackageManagerNotFoundException
-   * @throws CurrentActivityNotFoundException
-   */
-  val customTabsResolvingServices: ArrayList<String>
-    get() = packageManager.queryIntentServices(createDefaultCustomTabsServiceIntent(), 0)
-      .mapToDistinctArrayList { resolveInfo: ResolveInfo ->
-        resolveInfo.serviceInfo.packageName
-      }
+  override val customTabsResolvingServices: ArrayList<String>
+    get() {
+      return mapCollectionToDistinctArrayList(
+        packageManager.queryIntentServices(
+          createDefaultCustomTabsServiceIntent(),
+          0
+        )
+      ) { resolveInfo -> resolveInfo.serviceInfo.packageName }
+    }
 
-  /**
-   * @throws PackageManagerNotFoundException
-   * @throws CurrentActivityNotFoundException
-   */
-  fun getPreferredCustomTabsResolvingActivity(packages: List<String?>?): String? {
-    val resolvedPackages = packages ?: customTabsResolvingActivities
-    return CustomTabsClient.getPackageName(currentActivity, resolvedPackages)
+  override fun getPreferredCustomTabsResolvingActivity(packages: List<String>?): String? {
+    var packages: List<String>? = packages
+    if (packages == null) packages = customTabsResolvingActivities
+    return CustomTabsClient.getPackageName(currentActivity, packages)
   }
 
-  /**
-   * @throws PackageManagerNotFoundException
-   * @throws CurrentActivityNotFoundException
-   */
-  val defaultCustomTabsResolvingActivity: String?
+  override val defaultCustomTabsResolvingActivity: String?
     get() {
-      val info = packageManager.resolveActivity(createDefaultCustomTabsIntent(), 0)
+      val info: ResolveInfo? =
+        packageManager.resolveActivity(createDefaultCustomTabsIntent(), 0)
       return info?.activityInfo?.packageName
     }
 
-  /**
-   * @throws CurrentActivityNotFoundException
-   */
-  fun startCustomTabs(intent: Intent) {
-    currentActivity.startActivity(intent)
+  override fun canResolveIntent(intent: Intent): Boolean {
+    return getResolvingActivities(intent).isNotEmpty()
   }
 
-  // endregion
-
-  // region Private helpers
+  override fun startCustomTabs(intent: Intent) {
+    currentActivity.startActivity(intent)
+  }
 
-  /**
-   * @throws CurrentActivityNotFoundException
-   * @throws PackageManagerNotFoundException
-   */
   private fun getResolvingActivities(intent: Intent): List<ResolveInfo> {
     return packageManager.queryIntentActivities(intent, 0)
   }
 
-  /**
-   * @throws CurrentActivityNotFoundException
-   * @throws PackageManagerNotFoundException
-   */
   private val packageManager: PackageManager
-    get() = currentActivity.packageManager ?: throw PackageManagerNotFoundException()
+    get() {
+      val pm: PackageManager? = currentActivity.packageManager
+      if (pm == null) throw PackageManagerNotFoundException() else return pm
+    }
 
-  /**
-   * @throws CurrentActivityNotFoundException
-   */
   private val currentActivity: Activity
     get() {
-      return activityProvider?.getCurrentActivity() ?: throw CurrentActivityNotFoundException()
+      return activityProvider.getCurrentActivity()
+        ?: throw CurrentActivityNotFoundException()
     }
 
-  // endregion
-}
-
-private inline fun <T, R> Collection<T>.mapToDistinctArrayList(mapper: (T) -> R): ArrayList<R> {
-  val resultSet = LinkedHashSet<R>()
-  for (element in this) {
-    resultSet.add(mapper.invoke(element))
+  private fun createDefaultCustomTabsIntent(): Intent {
+    val builder: CustomTabsIntent.Builder = CustomTabsIntent.Builder()
+    val customTabsIntent: CustomTabsIntent = builder.build()
+    val intent: Intent = customTabsIntent.intent
+    intent.data = Uri.parse(DUMMY_URL)
+    return intent
   }
-  return ArrayList(resultSet)
-}
 
-private fun createDefaultCustomTabsIntent(): Intent {
-  val customTabsIntent = CustomTabsIntent.Builder().build()
-  return customTabsIntent.intent.apply {
-    data = Uri.parse(DUMMY_URL)
+  private fun createDefaultCustomTabsServiceIntent(): Intent {
+    val serviceIntent: Intent = Intent()
+    serviceIntent.action = CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION
+    return serviceIntent
   }
-}
 
-private fun createDefaultCustomTabsServiceIntent() = Intent().apply {
-  action = CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION
+  fun onDestroy() {}
+
+  companion object {
+    private val DUMMY_URL: String = "https://expo.io"
+    fun <T, R> mapCollectionToDistinctArrayList(
+      toMap: Collection<T>,
+      mapper: (T) -> R
+    ): ArrayList<R> {
+      val resultSet: LinkedHashSet<R> = LinkedHashSet()
+      for (element: T in toMap) {
+        resultSet.add(mapper(element))
+      }
+      return ArrayList(resultSet)
+    }
+  }
 }

android/src/main/java/com/reactnativewebbrowser/InternalCustomTabsActivitiesHelper.kt

@@ -6,92 +6,108 @@ import android.net.Uri
 import androidx.browser.customtabs.CustomTabsClient
 import androidx.browser.customtabs.CustomTabsServiceConnection
 import androidx.browser.customtabs.CustomTabsSession
+import com.facebook.react.bridge.LifecycleEventListener
 
-class InternalCustomTabsConnectionHelper(
-  private val context: Context
-) : CustomTabsServiceConnection() {
-  private var currentPackageName: String? = null
-  private val clientActions = DeferredClientActionsQueue<CustomTabsClient>()
-  private val sessionActions = DeferredClientActionsQueue<CustomTabsSession?>()
+class InternalCustomTabsConnectionHelper internal constructor(private val context: Context) :
+  CustomTabsServiceConnection(), LifecycleEventListener,
+  CustomTabsConnectionHelper {
+  private var mPackageName: String? = null
+  private val clientActions: DeferredClientActionsQueue<CustomTabsClient> =
+    DeferredClientActionsQueue()
+  private val sessionActions: DeferredClientActionsQueue<CustomTabsSession> =
+    DeferredClientActionsQueue()
 
-  // region lifecycle methods
-  fun destroy() = clearConnection()
-  // endregion
-
-  // region Actual connection helper methods
-  fun warmUp(packageName: String) {
-    clientActions.executeOrQueueAction { client: CustomTabsClient -> client.warmup(0) }
+  override fun warmUp(packageName: String) {
+    clientActions.executeOrQueueAction { client -> client.warmup(0) }
     ensureConnection(packageName)
   }
 
-  fun mayInitWithUrl(packageName: String, uri: Uri) {
-    sessionActions.executeOrQueueAction { session: CustomTabsSession? ->
-      session?.mayLaunchUrl(uri, null, null)
+  override fun mayInitWithUrl(packageName: String, uri: Uri) {
+    sessionActions.executeOrQueueAction { session ->
+      session.mayLaunchUrl(
+        uri,
+        null,
+        null
+      )
     }
     ensureConnection(packageName)
     ensureSession()
   }
 
-  fun coolDown(packageName: String): Boolean {
-    if (isConnectionStarted(packageName)) {
-      clearConnection()
+  private fun ensureSession() {
+    if (!sessionActions.hasClient()) {
+      clientActions.executeOrQueueAction { client ->
+        sessionActions.setClient(
+          client.newSession(null)
+        )
+      }
+    }
+  }
+
+  override fun coolDown(packageName: String): Boolean {
+    if ((packageName == mPackageName)) {
+      unbindService()
       return true
     }
     return false
   }
-  // endregion
 
-  // region CustomTabsServiceConnection implementation
+  private fun ensureConnection(packageName: String) {
+    if (mPackageName != null && !(mPackageName == packageName)) {
+      clearConnection()
+    }
+    if (!connectionStarted(packageName)) {
+      CustomTabsClient.bindCustomTabsService(context, packageName, this)
+      mPackageName = packageName
+    }
+  }
+
+  private fun connectionStarted(packageName: String): Boolean {
+    return (packageName == mPackageName)
+  }
+
   override fun onBindingDied(componentName: ComponentName) {
-    if (isConnectionStarted(componentName.packageName)) {
+    if ((componentName.packageName == mPackageName)) {
       clearConnection()
     }
   }
 
-  override fun onCustomTabsServiceConnected(componentName: ComponentName, client: CustomTabsClient) {
-    if (isConnectionStarted(componentName.packageName)) {
+  override fun onCustomTabsServiceConnected(
+    componentName: ComponentName,
+    client: CustomTabsClient
+  ) {
+    if ((componentName.packageName == mPackageName)) {
       clientActions.setClient(client)
     }
   }
 
   override fun onServiceDisconnected(componentName: ComponentName) {
-    if (isConnectionStarted(componentName.packageName)) {
+    if ((componentName.packageName == mPackageName)) {
       clearConnection()
     }
   }
-  // endregion
 
-  private fun ensureSession() {
-    if (sessionActions.hasClient()) {
-      return
-    }
+  override fun onHostResume() {
+    // do nothing
+  }
 
-    clientActions.executeOrQueueAction { client: CustomTabsClient ->
-      sessionActions.setClient(client.newSession(null))
-    }
+  override fun onHostPause() {
+    // do nothing
   }
 
-  private fun ensureConnection(packageName: String) {
-    if (currentPackageName != null && currentPackageName != packageName) {
-      clearConnection()
-    }
-    if (!isConnectionStarted(packageName)) {
-      CustomTabsClient.bindCustomTabsService(context, packageName, this)
-      currentPackageName = packageName
-    }
+  override fun onHostDestroy() {
+    unbindService()
   }
 
-  private fun isConnectionStarted(packageName: String): Boolean {
-    return packageName == currentPackageName
+  private fun unbindService() {
+    context.unbindService(this)
+    clearConnection()
   }
 
   private fun clearConnection() {
-    if (currentPackageName != null) {
-      context.unbindService(this)
-    }
-
-    currentPackageName = null
+    mPackageName = null
     clientActions.clear()
     sessionActions.clear()
   }
+
 }