Skip to content

Commit

Permalink
[other] ENGMT-xx: improvements to api connectivity
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@bredmond5
bredmond5 committed Dec 6, 2024
1 parent 6116867 commit e42851f
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 83 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/io/branch/branchlinksimulator/ApiConfigManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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? {
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/io/branch/branchlinksimulator/ApiSettingsPanel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import kotlin.system.exitProcess

const val SELECTED_CONFIG_NAME = "selectedConfigName"
const val PREFERENCES_KEY = "ApiPreferences"

@Composable
fun ApiSettingsPanel() {
fun ApiSettingsPanel(navController: NavController) {
val context = LocalContext.current
val preferences = remember { context.getSharedPreferences(PREFERENCES_KEY, Context.MODE_PRIVATE) }
var selectedConfig by remember { mutableStateOf(ApiConfigManager.loadConfigOrDefault(preferences)) }
Expand Down Expand Up @@ -58,6 +59,9 @@ fun ApiSettingsPanel() {
saveConfig(preferences, it)
})
}
RoundedButton(title = "See Requests", icon = R.drawable.branch_badge_all_white) {
navController.navigate("request")
}
}
}
}
Expand Down Expand Up @@ -153,7 +157,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()
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/branch/branchlinksimulator/BranchLinkSimulatorApplication.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
189 changes: 110 additions & 79 deletions app/src/main/java/io/branch/branchlinksimulator/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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()
}

Expand All @@ -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 {
Expand All @@ -172,6 +193,72 @@ fun MainContent(navController: NavController) {
customerEventAlias = savedAlias
var aliasValue by remember { mutableStateOf(savedAlias) }

if (showAliasDialog) {
AlertDialog(
onDismissRequest = { showAliasDialog = false },
title = { Text("Enter Customer Event Alias") },
text = {
TextField(
value = aliasValue,
onValueChange = { aliasValue = it },
label = { Text("Ex. mainAlias") },
)
},
confirmButton = {
TextButton(onClick = {
sharedPreferences.edit().putString("customer_event_alias", aliasValue).apply()
customerEventAlias = aliasValue
Toast.makeText(context, "Set Customer Event Alias to $aliasValue", Toast.LENGTH_SHORT).show()
showAliasDialog = false
}) {
Text("Save")
}
}
)
}

if (showSessionIdDialog) {
AlertDialog(
onDismissRequest = { showSessionIdDialog = false },
title = { Text("Enter A Session ID") },
text = {
TextField(
value = sessionIdValue,
onValueChange = { sessionIdValue = it },
label = { Text("Ex. testingSession02") },
)
},
confirmButton = {
TextButton(onClick = {
Branch.getInstance().setRequestMetadata("bls_session_id", sessionIdValue)
sharedPreferences.edit().putString("bls_session_id", sessionIdValue).apply()
Toast.makeText(context, "Set App's Session ID to $sessionIdValue", Toast.LENGTH_SHORT).show()
showSessionIdDialog = false
}) {
Text("Save")
}
}
)
}

if (initErrorMessageState.value != null && !initErrorMessageDialogShown) {
AlertDialog(
onDismissRequest = { initErrorMessageDialogShown = true },
title = { Text("Error initializing Branch") },
text = {
Text(initErrorMessageState.value ?: "")
},
confirmButton = {
TextButton(onClick = {
initErrorMessageDialogShown = true
}) {
Text("Ok")
}
}
)
}


LazyColumn(modifier = Modifier.padding(16.dp)) {
item {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
Expand Down Expand Up @@ -199,7 +286,7 @@ fun MainContent(navController: NavController) {
}

item { SectionHeader(title = "Api Settings")}
item { ApiSettingsPanel() }
item { ApiSettingsPanel(navController) }

item { SectionHeader(title = "Event Settings") }
item {
Expand All @@ -212,58 +299,6 @@ fun MainContent(navController: NavController) {
showSessionIdDialog = true
}
}

if (showAliasDialog) {
item {
AlertDialog(
onDismissRequest = { showAliasDialog = false },
title = { Text("Enter Customer Event Alias") },
text = {
TextField(
value = aliasValue,
onValueChange = { aliasValue = it },
label = { Text("Ex. mainAlias") },
)
},
confirmButton = {
TextButton(onClick = {
sharedPreferences.edit().putString("customer_event_alias", aliasValue).apply()
customerEventAlias = aliasValue
Toast.makeText(context, "Set Customer Event Alias to $aliasValue", Toast.LENGTH_SHORT).show()
showAliasDialog = false
}) {
Text("Save")
}
}
)
}
}

if (showSessionIdDialog) {
item {
AlertDialog(
onDismissRequest = { showSessionIdDialog = false },
title = { Text("Enter A Session ID") },
text = {
TextField(
value = sessionIdValue,
onValueChange = { sessionIdValue = it },
label = { Text("Ex. testingSession02") },
)
},
confirmButton = {
TextButton(onClick = {
Branch.getInstance().setRequestMetadata("bls_session_id", sessionIdValue)
sharedPreferences.edit().putString("bls_session_id", sessionIdValue).apply()
Toast.makeText(context, "Set App's Session ID to $sessionIdValue", Toast.LENGTH_SHORT).show()
showSessionIdDialog = false
}) {
Text("Save")
}
}
)
}
}
}
}

Expand Down Expand Up @@ -344,10 +379,6 @@ fun EventsColumn(navController: NavController, modifier: Modifier = Modifier, co
icon = R.drawable.send_custom
)
{ sendCustomEvent(context) }

RoundedButton(title = "See Requests", icon = R.drawable.branch_badge_all_white) {
navController.navigate("request")
}
}
}

Expand Down

0 comments on commit e42851f

Please sign in to comment.