Skip to content

Commit e136f93

Browse files
committed
fix emulator
1 parent 05b0218 commit e136f93

File tree

3 files changed

+16
-25
lines changed

3 files changed

+16
-25
lines changed

composeapp/src/main/java/com/firebase/composeapp/AuthFlowControllerDemoActivity.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.firebase.ui.auth.compose.FirebaseAuthUI
2222
import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration
2323
import com.firebase.ui.auth.compose.configuration.PasswordRule
2424
import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
25-
import com.google.firebase.FirebaseApp
2625
import com.google.firebase.auth.FirebaseAuth
2726
import com.google.firebase.auth.actionCodeSettings
2827
import kotlinx.coroutines.launch
@@ -72,16 +71,9 @@ class AuthFlowControllerDemoActivity : ComponentActivity() {
7271
override fun onCreate(savedInstanceState: Bundle?) {
7372
super.onCreate(savedInstanceState)
7473

75-
FirebaseApp.initializeApp(applicationContext)
76-
7774
// Initialize FirebaseAuthUI
7875
val authUI = FirebaseAuthUI.getInstance()
7976

80-
// Use emulator if needed
81-
if (USE_AUTH_EMULATOR) {
82-
authUI.auth.useEmulator(AUTH_EMULATOR_HOST, AUTH_EMULATOR_PORT)
83-
}
84-
8577
// Create auth configuration
8678
val configuration = AuthUIConfiguration(
8779
context = applicationContext,
@@ -159,10 +151,6 @@ class AuthFlowControllerDemoActivity : ComponentActivity() {
159151
}
160152

161153
companion object {
162-
private const val USE_AUTH_EMULATOR = true
163-
private const val AUTH_EMULATOR_HOST = "10.0.2.2"
164-
private const val AUTH_EMULATOR_PORT = 9099
165-
166154
fun createIntent(context: Context): Intent {
167155
return Intent(context, AuthFlowControllerDemoActivity::class.java)
168156
}

composeapp/src/main/java/com/firebase/composeapp/HighLevelApiDemoActivity.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,13 @@ import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme
2929
import com.firebase.ui.auth.compose.ui.screens.EmailSignInLinkHandlerActivity
3030
import com.firebase.ui.auth.compose.ui.screens.FirebaseAuthScreen
3131
import com.firebase.ui.auth.compose.ui.screens.AuthSuccessUiContext
32-
import com.google.firebase.FirebaseApp
3332
import com.google.firebase.auth.actionCodeSettings
3433

3534
class HighLevelApiDemoActivity : ComponentActivity() {
36-
companion object {
37-
private const val USE_AUTH_EMULATOR = true
38-
private const val AUTH_EMULATOR_HOST = "10.0.2.2"
39-
private const val AUTH_EMULATOR_PORT = 9099
40-
}
41-
4235
override fun onCreate(savedInstanceState: Bundle?) {
4336
super.onCreate(savedInstanceState)
4437

45-
FirebaseApp.initializeApp(applicationContext)
4638
val authUI = FirebaseAuthUI.getInstance()
47-
48-
if (USE_AUTH_EMULATOR) {
49-
authUI.auth.useEmulator(AUTH_EMULATOR_HOST, AUTH_EMULATOR_PORT)
50-
}
51-
5239
val emailLink = intent.getStringExtra(EmailSignInLinkHandlerActivity.EXTRA_EMAIL_LINK)
5340

5441
val configuration = authUIConfiguration {

composeapp/src/main/java/com/firebase/composeapp/MainActivity.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,32 @@ import androidx.compose.ui.Alignment
1212
import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.text.style.TextAlign
1414
import androidx.compose.ui.unit.dp
15+
import com.firebase.ui.auth.compose.FirebaseAuthUI
16+
import com.google.firebase.FirebaseApp
1517

1618
/**
1719
* Main launcher activity that allows users to choose between different
1820
* authentication API demonstrations.
1921
*/
2022
class MainActivity : ComponentActivity() {
23+
companion object {
24+
private const val USE_AUTH_EMULATOR = true
25+
private const val AUTH_EMULATOR_HOST = "10.0.2.2"
26+
private const val AUTH_EMULATOR_PORT = 9099
27+
}
28+
2129
override fun onCreate(savedInstanceState: Bundle?) {
2230
super.onCreate(savedInstanceState)
2331
enableEdgeToEdge()
2432

33+
// Initialize Firebase and configure emulator if needed
34+
FirebaseApp.initializeApp(applicationContext)
35+
val authUI = FirebaseAuthUI.getInstance()
36+
37+
if (USE_AUTH_EMULATOR) {
38+
authUI.auth.useEmulator(AUTH_EMULATOR_HOST, AUTH_EMULATOR_PORT)
39+
}
40+
2541
setContent {
2642
MaterialTheme {
2743
Surface(

0 commit comments

Comments
 (0)