From ee3d48201c0b7dc92d9df9c62be667eb1307e50f Mon Sep 17 00:00:00 2001 From: Ahsan Ishaq Date: Thu, 11 Jul 2024 18:53:33 +0500 Subject: [PATCH] Removed code related to google sign in. --- .idea/.name | 1 - .../main/java/com/ivy/wallet/RootActivity.kt | 36 ------------------- .../com/ivy/onboarding/OnboardingEvent.kt | 1 - .../onboarding/steps/OnboardingSplashLogin.kt | 36 ------------------- .../viewmodel/OnboardingViewModel.kt | 25 ------------- 5 files changed, 99 deletions(-) delete mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index e5603e47ef..0000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -IvyWallet \ No newline at end of file diff --git a/app/src/main/java/com/ivy/wallet/RootActivity.kt b/app/src/main/java/com/ivy/wallet/RootActivity.kt index 66a280723d..f49ae8da37 100644 --- a/app/src/main/java/com/ivy/wallet/RootActivity.kt +++ b/app/src/main/java/com/ivy/wallet/RootActivity.kt @@ -72,7 +72,6 @@ class RootActivity : AppCompatActivity(), RootScreen { @Inject lateinit var customerJourneyLogic: CustomerJourneyCardsProvider - private lateinit var googleSignInLauncher: ActivityResultLauncher private lateinit var onGoogleSignInIdTokenResult: (idToken: String?) -> Unit private lateinit var createFileLauncher: ActivityResultLauncher @@ -209,47 +208,12 @@ class RootActivity : AppCompatActivity(), RootScreen { } private fun setupActivityForResultLaunchers() { - googleSignInLauncher() createFileLauncher() openFileLauncher() } - private fun googleSignInLauncher() { - googleSignInLauncher = activityForResultLauncher( - createIntent = { _, client -> - client.signInIntent - } - ) { _, intent -> - try { - val task: Task = - GoogleSignIn.getSignedInAccountFromIntent(intent) - val account: GoogleSignInAccount = task.getResult(ApiException::class.java) - val idToken = account.idToken - Timber.d("idToken = $idToken") - - onGoogleSignInIdTokenResult(idToken) - } catch (e: ApiException) { - e.sendToCrashlytics("GOOGLE_SIGN_IN - registerGoogleSignInContract(): ApiException") - e.printStackTrace() - onGoogleSignInIdTokenResult(null) - } - } - - ivyContext.googleSignIn = { idTokenResult: (String?) -> Unit -> - onGoogleSignInIdTokenResult = idTokenResult - - val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) - .requestEmail() - .requestProfile() - .requestIdToken("364763737033-t1d2qe7s0s8597k7anu3sb2nq79ot5tp.apps.googleusercontent.com") - .build() - val googleSignInClient = GoogleSignIn.getClient(this, gso) - googleSignInLauncher.launch(googleSignInClient) - } - } - private fun createFileLauncher() { createFileLauncher = activityForResultLauncher( createIntent = { _, fileName -> diff --git a/screen/onboarding/src/main/java/com/ivy/onboarding/OnboardingEvent.kt b/screen/onboarding/src/main/java/com/ivy/onboarding/OnboardingEvent.kt index 8d09a30b50..437bee2851 100644 --- a/screen/onboarding/src/main/java/com/ivy/onboarding/OnboardingEvent.kt +++ b/screen/onboarding/src/main/java/com/ivy/onboarding/OnboardingEvent.kt @@ -8,7 +8,6 @@ import com.ivy.wallet.domain.deprecated.logic.model.CreateCategoryData sealed interface OnboardingEvent { - data object LoginWithGoogle : OnboardingEvent data object LoginOfflineAccount : OnboardingEvent data object StartImport : OnboardingEvent data object ImportSkip : OnboardingEvent diff --git a/screen/onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSplashLogin.kt b/screen/onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSplashLogin.kt index 291867a8dc..6a00de6380 100644 --- a/screen/onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSplashLogin.kt +++ b/screen/onboarding/src/main/java/com/ivy/onboarding/steps/OnboardingSplashLogin.kt @@ -292,42 +292,6 @@ private fun LoginSection( } } -@Composable -private fun LoginWithGoogleExplanation() { - Row( - verticalAlignment = Alignment.CenterVertically - ) { - Spacer(Modifier.width(24.dp)) - - IvyIcon( - icon = R.drawable.ic_secure, - tint = Green - ) - - Spacer(Modifier.width(4.dp)) - - Column { - Text( - text = stringResource(R.string.sync_data_ivy_cloud), - style = UI.typo.c.style( - color = Green, - fontWeight = FontWeight.ExtraBold - ) - ) - - Spacer(Modifier.height(2.dp)) - - Text( - text = stringResource(R.string.data_integrity_protection_warning), - style = UI.typo.c.style( - color = UI.colors.pureInverse, - fontWeight = FontWeight.Medium - ) - ) - } - } -} - @Composable private fun LocalAccountExplanation() { Text( diff --git a/screen/onboarding/src/main/java/com/ivy/onboarding/viewmodel/OnboardingViewModel.kt b/screen/onboarding/src/main/java/com/ivy/onboarding/viewmodel/OnboardingViewModel.kt index b8f659c8ef..3be9d263a8 100644 --- a/screen/onboarding/src/main/java/com/ivy/onboarding/viewmodel/OnboardingViewModel.kt +++ b/screen/onboarding/src/main/java/com/ivy/onboarding/viewmodel/OnboardingViewModel.kt @@ -150,7 +150,6 @@ class OnboardingViewModel @Inject constructor( is OnboardingEvent.ImportFinished -> importFinished(event.success) OnboardingEvent.ImportSkip -> importSkip() OnboardingEvent.LoginOfflineAccount -> loginOfflineAccount() - OnboardingEvent.LoginWithGoogle -> loginWithGoogle() OnboardingEvent.OnAddAccountsDone -> onAddAccountsDone() OnboardingEvent.OnAddAccountsSkip -> onAddAccountsSkip() OnboardingEvent.OnAddCategoriesDone -> onAddCategoriesDone() @@ -162,30 +161,6 @@ class OnboardingViewModel @Inject constructor( } } - // Step 1 --------------------------------------------------------------------------------------- - private suspend fun loginWithGoogle() { - ivyContext.googleSignIn { idToken -> - if (idToken != null) { - _opGoogleSignIn.value = OpResult.loading() - viewModelScope.launch { - try { - router.googleLoginNext() - _opGoogleSignIn.value = null // reset login with Google operation state - } catch (e: Exception) { - e.sendToCrashlytics("GOOGLE_SIGN_IN ERROR: generic exception when logging with GOOGLE") - e.printStackTrace() - Timber.e("Login with Google failed on Ivy server - ${e.message}") - _opGoogleSignIn.value = OpResult.failure(e) - } - } - } else { - sendToCrashlytics("GOOGLE_SIGN_IN ERROR: idToken is null!!") - Timber.e("Login with Google failed while getting idToken") - _opGoogleSignIn.value = OpResult.faliure("Login with Google failed, try again.") - } - } - } - private suspend fun loginOfflineAccount() { router.offlineAccountNext() }