@W-15548296: [MSDK Android] NetworkOnMainThreadException In App Created From Hybrid Local Template (#2552)

Author: JohnsonEricAtSalesforce

libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/ui/SalesforceDroidGapActivity.kt

@@ -26,7 +26,6 @@
  */
 package com.salesforce.androidsdk.phonegap.ui
 
-import android.net.Uri.parse
 import android.os.Bundle
 import android.view.KeyEvent
 import android.webkit.URLUtil.isHttpsUrl
@@ -57,7 +56,11 @@ import com.salesforce.androidsdk.util.AuthConfigUtil.MyDomainAuthConfig
 import com.salesforce.androidsdk.util.AuthConfigUtil.getMyDomainAuthConfig
 import com.salesforce.androidsdk.util.EventsObservable
 import com.salesforce.androidsdk.util.EventsObservable.EventType.GapWebViewCreateComplete
+import com.salesforce.androidsdk.util.SalesforceSDKLogger
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers.Default
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeout
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.apache.cordova.CallbackContext
 import org.apache.cordova.CordovaActivity
@@ -581,21 +584,26 @@ open class SalesforceDroidGapActivity : CordovaActivity(), SalesforceActivityInt
     }
 
     private fun doAuthConfig() {
-        val loginServer = SalesforceHybridSDKManager
-            .getInstance()
-            .loginServerManager
-            .selectedLoginServer
-            ?.url
-            ?.trim { it <= ' ' } ?: return
-
-        if (loginServer == PRODUCTION_LOGIN_URL || loginServer == SANDBOX_LOGIN_URL || !isHttpsUrl(loginServer) || parse(loginServer) == null
-        ) {
-            return
-        }
-
-        authConfig = getMyDomainAuthConfig(loginServer)
+        CoroutineScope(Default).launch {
+            runCatching {
+                withTimeout(5000L) {
+                    val loginServer = SalesforceHybridSDKManager
+                        .getInstance()
+                        .loginServerManager
+                        .selectedLoginServer
+                        ?.url
+                        ?.trim { it <= ' ' } ?: return@withTimeout
+
+                    if (loginServer == PRODUCTION_LOGIN_URL || loginServer == SANDBOX_LOGIN_URL || !isHttpsUrl(loginServer) || loginServer.toHttpUrlOrNull() == null) {
+                        return@withTimeout
+                    }
 
-        return
+                    authConfig = getMyDomainAuthConfig(loginServer)
+                }
+            }.onFailure { e ->
+                SalesforceSDKLogger.e(TAG, "Exception occurred while fetching authentication configuration", e)
+            }
+        }
     }
 
     companion object {

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

@@ -564,6 +564,7 @@ open class SalesforceSDKManager protected constructor(
      * license
      * @return The Native Login Manager.
      */
+    @Suppress("unused")
     fun useNativeLogin(
         consumerKey: String,
         callbackUrl: String,
@@ -1399,12 +1400,12 @@ open class SalesforceSDKManager protected constructor(
      * Determines whether the device has a compact screen.
      * Taken directly from https://developer.android.com/guide/topics/large-screens/large-screen-cookbook#kotlin
      */
-    fun compactScreen(activity: Activity) : Boolean {
+    fun compactScreen(activity: Activity): Boolean {
         val metrics = WindowMetricsCalculator.getOrCreate().computeMaximumWindowMetrics(activity)
         val width = metrics.bounds.width()
         val height = metrics.bounds.height()
         val density = activity.resources.displayMetrics.density
-        val windowSizeClass = WindowSizeClass.compute(width/density, height/density)
+        val windowSizeClass = WindowSizeClass.compute(width / density, height / density)
 
         return windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT ||
                 windowSizeClass.windowHeightSizeClass == WindowHeightSizeClass.COMPACT
@@ -1443,6 +1444,7 @@ open class SalesforceSDKManager protected constructor(
          * TODO: Remove the suppress lint annotation once the Android context is no longer retained.
          */
         @JvmField
+        @SuppressLint("StaticFieldLeak")
         protected var INSTANCE: SalesforceSDKManager? = null
 
         /** The current version of this SDK */
@@ -1749,8 +1751,7 @@ open class SalesforceSDKManager protected constructor(
             withTimeout(5000L) {
                 val loginServer = loginServerManager.selectedLoginServer?.url?.trim { it <= ' ' } ?: return@withTimeout
 
-                if (loginServer == PRODUCTION_LOGIN_URL || loginServer == SANDBOX_LOGIN_URL || !isHttpsUrl(loginServer) || loginServer.toHttpUrlOrNull() == null
-                ) {
+                if (loginServer == PRODUCTION_LOGIN_URL || loginServer == SANDBOX_LOGIN_URL || !isHttpsUrl(loginServer) || loginServer.toHttpUrlOrNull() == null) {
                     setBrowserLoginEnabled(
                         browserLoginEnabled = false,
                         shareBrowserSessionEnabled = false