[other] ENGMT-xx: improvements to api connectivity

Now we will show an alert dialogue if branch initialization fails, helping users realize they need to be on VPN Also, defaults to production since more people will be using that
BranchMetrics · Dec 6, 2024 · eda710b · eda710b
1 parent 6116867
commit eda710b
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 25 deletions.
diff --git a/app/src/main/java/io/branch/branchlinksimulator/ApiConfigManager.kt b/app/src/main/java/io/branch/branchlinksimulator/ApiConfigManager.kt
@@ -4,7 +4,7 @@ import android.content.SharedPreferences
 
 object ApiConfigManager {
     fun loadConfigOrDefault(preferences: SharedPreferences): ApiConfiguration {
-        return loadConfig(preferences) ?: apiConfigurationsMap[STAGING] ?: ApiConfiguration("N/A", "N/A", "N/A", false)
+        return loadConfig(preferences) ?: apiConfigurationsMap[PRODUCTION] ?: ApiConfiguration("N/A", "N/A", "N/A", false)
     }
 
     private fun loadConfig(preferences: SharedPreferences): ApiConfiguration? {

diff --git a/app/src/main/java/io/branch/branchlinksimulator/ApiSettingsPanel.kt b/app/src/main/java/io/branch/branchlinksimulator/ApiSettingsPanel.kt
@@ -153,7 +153,7 @@ fun ApiButton(
 }
 
 fun saveConfig(preferences: SharedPreferences, config: ApiConfiguration) {
-    val configName = apiConfigurationsMap.entries.firstOrNull { it.value == config }?.key ?: STAGING
+    val configName = apiConfigurationsMap.entries.firstOrNull { it.value == config }?.key ?: PRODUCTION
     preferences.edit().putString(SELECTED_CONFIG_NAME, configName).apply()
 }
 

diff --git a/app/src/main/java/io/branch/branchlinksimulator/BranchLinkSimulatorApplication.kt b/app/src/main/java/io/branch/branchlinksimulator/BranchLinkSimulatorApplication.kt
@@ -6,7 +6,7 @@ import io.branch.referral.Branch
 import java.util.UUID
 
 class BranchLinkSimulatorApplication: Application() {
-    private lateinit var currentConfig: ApiConfiguration
+    lateinit var currentConfig: ApiConfiguration
     lateinit var roundTripStore: RoundTripStore
         private set
 

diff --git a/app/src/main/java/io/branch/branchlinksimulator/MainActivity.kt b/app/src/main/java/io/branch/branchlinksimulator/MainActivity.kt
@@ -58,9 +58,14 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.runtime.State
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
 import java.util.UUID
+import kotlin.coroutines.resume
 
 var customerEventAlias = ""
 var sessionID = ""
@@ -71,9 +76,10 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         this.roundTripStore = (application as BranchLinkSimulatorApplication).roundTripStore
 
+        val initErrorMessageState = mutableStateOf<String?>(null)
+
         setContent {
             BranchLinkSimulatorTheme {
                 Surface(
@@ -83,11 +89,14 @@ class MainActivity : ComponentActivity() {
                     navController = rememberNavController()
                     NavHost(navController = navController!!, startDestination = "main") {
                         composable("main") {
-                            MainContent(navController!!)
+                            MainContent(navController!!, initErrorMessageState)
                         }
 
                         composable("request") {
-                            RoundTripsNavHost(navController = rememberNavController(), roundTripStore = roundTripStore)
+                            RoundTripsNavHost(
+                                navController = rememberNavController(),
+                                roundTripStore = roundTripStore
+                            )
                         }
 
                         composable(
@@ -105,36 +114,47 @@ class MainActivity : ComponentActivity() {
                             val params = backStackEntry.arguments?.getString("params") ?: ""
                             DetailScreen(title, parseQueryParams(params))
                         }
-
                     }
                 }
             }
         }
-    }
 
-    override fun onStart() {
-        super.onStart()
+        lifecycleScope.launch {
+            val initErrorMessage = initializeBranch()
+            initErrorMessageState.value = initErrorMessage
+        }
+    }
 
+    private suspend fun initializeBranch(): String? = suspendCancellableCoroutine { continuation ->
         Branch.sessionBuilder(this).withCallback { branchUniversalObject, linkProperties, error ->
             if (error != null) {
-                Log.e("BranchSDK_Tester", "branch init failed. Caused by -" + error.message)
-            } else {
-                Log.i("BranchSDK_Tester", "branch init complete!")
-                if (branchUniversalObject != null && linkProperties != null) {
-                    val title = branchUniversalObject.title ?: "Default Title"
+                Log.e("BranchSDK_Tester", "Branch init failed. Caused by - ${error.message}")
+                if (error.message == null)
+                    continuation.resume("unknown error occurred")
+                var msg = error.message
+                if ((application as BranchLinkSimulatorApplication).currentConfig.staging)
+                    msg += " Are you connected to vpn?"
+                continuation.resume(msg)
+                return@withCallback
+            }
+            Log.i("BranchSDK_Tester", "Branch init complete!")
+            if (branchUniversalObject == null || linkProperties == null) {
+                continuation.resume(null)
+                return@withCallback
+            }
 
+            val title = branchUniversalObject.title ?: "Default Title"
 
-                    val lpQueryString =  convertLinkPropertiesToQueryString(linkProperties)
-                    val buoQueryString = convertBUOToQueryString(branchUniversalObject)
+            val lpQueryString = convertLinkPropertiesToQueryString(linkProperties)
+            val buoQueryString = convertBUOToQueryString(branchUniversalObject)
 
-                    val combinedQueryString = listOf(buoQueryString, lpQueryString)
-                        .filterNot { it.isEmpty() }
-                        .joinToString("&")
+            val combinedQueryString = listOf(buoQueryString, lpQueryString)
+                .filterNot { it.isEmpty() }
+                .joinToString("&")
 
-                    Log.i("BranchSDK_Tester", "Navigating to details/$title/$combinedQueryString")
-                    navController?.navigate("details/$title/$combinedQueryString")
-                }
-            }
+            Log.i("BranchSDK_Tester", "Navigating to details/$title/$combinedQueryString")
+            navController?.navigate("details/$title/$combinedQueryString")
+            continuation.resume(null)
         }.withData(this.intent.data).init()
     }
 
@@ -154,10 +174,11 @@ class MainActivity : ComponentActivity() {
 }
 
 @Composable
-fun MainContent(navController: NavController) {
+fun MainContent(navController: NavController, initErrorMessageState: State<String?>) {
     val context = LocalContext.current
     var showAliasDialog by remember { mutableStateOf(false) }
     var showSessionIdDialog by remember { mutableStateOf(false) }
+    var initErrorMessageDialogShown by remember { mutableStateOf(false) }
 
     val sharedPreferences = context.getSharedPreferences("branch_session_prefs", Context.MODE_PRIVATE)
     val blsSessionId = sharedPreferences.getString("bls_session_id", null) ?: UUID.randomUUID().toString().also {
@@ -239,6 +260,25 @@ fun MainContent(navController: NavController) {
             }
         }
 
+        if (initErrorMessageState.value != null && !initErrorMessageDialogShown) {
+            item {
+                AlertDialog(
+                    onDismissRequest = { initErrorMessageDialogShown = true },
+                    title = { Text("Error initializing Branch") },
+                    text = {
+                        Text(initErrorMessageState.value ?: "")
+                    },
+                    confirmButton = {
+                        TextButton(onClick = {
+                            initErrorMessageDialogShown = true
+                        }) {
+                            Text("Ok")
+                        }
+                    }
+                )
+            }
+        }
+
         if (showSessionIdDialog) {
             item {
                 AlertDialog(