Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android/ui: show count of Mullvad countries, also fix navigation-rela… #301

Merged
merged 1 commit into from
Apr 10, 2024

Conversation

oxtoacart
Copy link
Contributor

…ted crash when adding new account

Updates tailscale/corp#18202

@oxtoacart oxtoacart requested a review from agottardo April 9, 2024 19:03
@oxtoacart oxtoacart force-pushed the ox/mullvad_country_count branch from 8d949c2 to 45cb242 Compare April 9, 2024 19:35
@@ -106,7 +105,7 @@ class MainActivity : ComponentActivity() {

setContent {
AppTheme {
val navController = rememberNavController()
navController = rememberNavController()
Copy link
Contributor Author

@oxtoacart oxtoacart Apr 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a drive-by fix errors like

kotlin.UninitializedPropertyAccessException: lateinit property navController has not been initialized
                                                                                                    	at com.tailscale.ipn.MainActivity.onNewIntent(MainActivity.kt:248)                                                                                               	

}
composable("runExitNode") { RunExitNodeView(exitNodePickerNav) }
}
composable("exitNodes") { ExitNodePicker(exitNodePickerNav) }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a drive-by fix to broken back-navigation from Mullvad to exit nodes

@oxtoacart oxtoacart requested a review from kari-ts April 9, 2024 19:40
…ted crash when adding new account

Updates tailscale/corp#18202

Signed-off-by: Percy Wegmann <percy@tailscale.com>
@oxtoacart oxtoacart force-pushed the ox/mullvad_country_count branch from 45cb242 to 7982b9e Compare April 10, 2024 16:50
@oxtoacart oxtoacart merged commit c59c853 into main Apr 10, 2024
4 checks passed
@oxtoacart oxtoacart deleted the ox/mullvad_country_count branch April 10, 2024 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants