From 4bcb604bb7fa9282dcef3dba73215a737c6a3ff0 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN <youbeene3409@naver.com> Date: Sun, 7 Jul 2024 05:27:42 +0900 Subject: [PATCH] =?UTF-8?q?[FIX/#5]=20=EB=AC=B4=ED=95=9C=20=EB=A1=9C?= =?UTF-8?q?=EB=94=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/terning/point/MyApp.kt | 6 ++---- .../terning/feature/onboarding/signin/SignInRoute.kt | 1 + .../feature/onboarding/signin/SignInViewModel.kt | 12 ++++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/terning/point/MyApp.kt b/app/src/main/java/com/terning/point/MyApp.kt index 005a6a02a..2d991562c 100644 --- a/app/src/main/java/com/terning/point/MyApp.kt +++ b/app/src/main/java/com/terning/point/MyApp.kt @@ -1,12 +1,10 @@ package com.terning.point import android.app.Application -import android.util.Log import androidx.appcompat.app.AppCompatDelegate +import com.kakao.sdk.common.KakaoSdk import dagger.hilt.android.HiltAndroidApp import timber.log.Timber -import com.kakao.sdk.common.KakaoSdk -import com.kakao.sdk.common.util.Utility @HiltAndroidApp class MyApp : Application() { @@ -27,7 +25,7 @@ class MyApp : Application() { AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO) } - private fun initKakoSdk(){ + private fun initKakoSdk() { KakaoSdk.init(this, BuildConfig.NATIVE_APP_KEY) } } \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt b/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt index bb6689889..5b4c9baab 100644 --- a/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt +++ b/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt @@ -24,6 +24,7 @@ import com.terning.core.designsystem.theme.TerningTheme import com.terning.core.extension.toast import com.terning.feature.R import com.terning.feature.home.navigation.navigateHome +import com.terning.feature.mypage.navigation.navigateMyPage import com.terning.feature.onboarding.signin.component.KakaoButton @Composable diff --git a/feature/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt b/feature/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt index 90c72292d..1ab0a6824 100644 --- a/feature/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt +++ b/feature/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt @@ -45,17 +45,21 @@ class SignInViewModel @Inject constructor() : ViewModel() { private fun signInResult(context: Context, token: OAuthToken?, error: Throwable?) { viewModelScope.launch { if (error != null) { - signInFailure(context, token, error) + signInFailure(context, error) } else if (token != null) { signInSuccess(token) } } } - private fun signInFailure(context: Context, token: OAuthToken?, error: Throwable?) { + private fun signInFailure(context: Context, error: Throwable?) { if (error.toString().contains(KAKAO_NOT_LOGGED_IN)) { - UserApiClient.instance.loginWithKakaoAccount(context) { _, _ -> - signInResult(context, token, error) + UserApiClient.instance.loginWithKakaoAccount(context) { token, _ -> + if (error != null) { + sigInCancellationOrError(error) + } else if (token != null) { + signInSuccess(token) + } } } else { sigInCancellationOrError(error)