From 35608655a84e1a87931bd7381bf057862b2ceda3 Mon Sep 17 00:00:00 2001 From: Martin Bonnin Date: Wed, 17 Apr 2024 09:26:21 +0200 Subject: [PATCH] merge bookmarks on signin --- .../src/main/java/fr/paug/androidmakers/MainActivity.kt | 9 ++++++++- .../androidmakers/ui/common/navigation/UserViewModel.kt | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/androidApp/src/main/java/fr/paug/androidmakers/MainActivity.kt b/androidApp/src/main/java/fr/paug/androidmakers/MainActivity.kt index ce0ac2f4..7cfe2fa8 100644 --- a/androidApp/src/main/java/fr/paug/androidmakers/MainActivity.kt +++ b/androidApp/src/main/java/fr/paug/androidmakers/MainActivity.kt @@ -130,7 +130,14 @@ class MainActivity : AppCompatActivity() { val result = auth.signInWithCredential(firebaseCredential) // Sign in success, update UI with the signed-in user's information lifecycleScope.launch { - UserData().userRepository.setUser(result.user) + UserData().apply { + userRepository.setUser(result.user) + val uid = result.user?.uid + if (uid != null) { + syncBookmarksUseCase(uid) + } + } + println("user id=${result.user?.uid}") println("idToken=${result.user?.getIdToken(true)}") } diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/UserViewModel.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/UserViewModel.kt index 90d875f3..03561fd1 100644 --- a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/UserViewModel.kt +++ b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/UserViewModel.kt @@ -1,11 +1,13 @@ package com.androidmakers.ui.common.navigation +import fr.androidmakers.domain.interactor.SyncBookmarksUseCase import fr.androidmakers.domain.repo.UserRepository import org.koin.core.component.KoinComponent import org.koin.core.component.inject class UserData: KoinComponent { val userRepository: UserRepository by inject() + val syncBookmarksUseCase: SyncBookmarksUseCase by inject() }