diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6af02ee7..28651f61 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,6 +10,7 @@ plugins { alias(libs.plugins.navigationSafeArgs) alias(libs.plugins.googleServices) alias(libs.plugins.firebaseCrashlytics) + alias(libs.plugins.firebasePerf) } val properties = Properties().apply { @@ -24,8 +25,8 @@ android { applicationId = "com.kuit.findu" minSdk = 28 targetSdk = 35 - versionCode = 19 - versionName = "1.1.4" + versionCode = 21 + versionName = "1.1.6" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" buildConfigField("String", "GPT_KEY", properties["GPT_KEY"].toString()) @@ -171,6 +172,7 @@ dependencies { implementation(libs.firebase.analytics.ktx) implementation(libs.firebase.config.ktx) implementation(libs.firebase.crashlytics) + implementation(libs.firebase.perf) // AdMob implementation("com.google.android.gms:play-services-ads:23.1.0") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7979c5fa..651a7f66 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,8 @@ - @@ -47,6 +48,11 @@ android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="ca-app-pub-7675272869453438~5374193050" /> + + + ? = null + override fun onCreate() { super.onCreate() @@ -21,5 +40,35 @@ class FindUApp : Application() { // AdMob 초기화 MobileAds.initialize(this) + + registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks { + override fun onActivityResumed(activity: Activity) { + currentActivity = WeakReference(activity) + } + + override fun onActivityPaused(activity: Activity) { + if (currentActivity?.get() === activity) { + currentActivity = null + } + } + + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {} + override fun onActivityStarted(activity: Activity) {} + override fun onActivityStopped(activity: Activity) {} + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} + override fun onActivityDestroyed(activity: Activity) {} + }) + + applicationScope.launch { + sessionExpiredEventManager.sessionExpiredEvent.collect { + val activity = currentActivity?.get() ?: return@collect + if (activity is LoginActivity || activity is SplashActivity) return@collect + + val intent = Intent(activity, LoginActivity::class.java).apply { + flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK + } + activity.startActivity(intent) + } + } } } diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthAuthenticator.kt b/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthAuthenticator.kt index ae9c3111..d1aa8dd1 100644 --- a/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthAuthenticator.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthAuthenticator.kt @@ -13,14 +13,23 @@ import javax.inject.Inject class AuthAuthenticator @Inject constructor( private val tokenLocalDataSource: TokenLocalDataSource, private val reissueService: ReissueService, + private val sessionExpiredEventManager: SessionExpiredEventManager, ) : Authenticator { override fun authenticate(route: Route?, response: Response): Request? { - // 401 Unauthorized 에러 감지 - if (response.code == 401) { + val staleToken = tokenLocalDataSource.accessToken + + synchronized(LOCK) { + val currentToken = tokenLocalDataSource.accessToken + + if (currentToken != staleToken) { + return response.request.newBuilder() + .header("Authorization", "Bearer $currentToken") + .build() + } + return try { val refreshToken = tokenLocalDataSource.refreshToken - // 토큰 재발급 요청 val reissueResponse = runBlocking { reissueService.postReissueToken( TokenReissueRequestDto(refreshToken) @@ -28,26 +37,26 @@ class AuthAuthenticator @Inject constructor( } if (reissueResponse.success) { - // 새로운 토큰으로 저장 tokenLocalDataSource.accessToken = reissueResponse.data.accessToken tokenLocalDataSource.refreshToken = reissueResponse.data.refreshToken - // 새로운 토큰으로 원래 요청 재시도 response.request.newBuilder() .header("Authorization", "Bearer ${reissueResponse.data.accessToken}") .build() } else { - // 토큰 재발급 실패 - 로그인 화면으로 이동 tokenLocalDataSource.clearToken() + sessionExpiredEventManager.notifySessionExpired() null } } catch (e: Exception) { - // 토큰 재발급 중 오류 발생 - 로그인 화면으로 이동 tokenLocalDataSource.clearToken() + sessionExpiredEventManager.notifySessionExpired() null } } + } - return null + companion object { + private val LOCK = Any() } } diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthErrorInterceptor.kt b/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthErrorInterceptor.kt new file mode 100644 index 00000000..33e5ba55 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthErrorInterceptor.kt @@ -0,0 +1,22 @@ +package com.kuit.findu.data.dataremote.util + +import com.kuit.findu.data.datalocal.datasource.TokenLocalDataSource +import okhttp3.Interceptor +import okhttp3.Response +import javax.inject.Inject + +class AuthErrorInterceptor @Inject constructor( + private val tokenLocalDataSource: TokenLocalDataSource, + private val sessionExpiredEventManager: SessionExpiredEventManager, +) : Interceptor { + override fun intercept(chain: Interceptor.Chain): Response { + val response = chain.proceed(chain.request()) + + if (response.code == 403) { + tokenLocalDataSource.clearToken() + sessionExpiredEventManager.notifySessionExpired() + } + + return response + } +} diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/util/Exceptions.kt b/app/src/main/java/com/kuit/findu/data/dataremote/util/Exceptions.kt index 1483eda3..f978de7f 100644 --- a/app/src/main/java/com/kuit/findu/data/dataremote/util/Exceptions.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/util/Exceptions.kt @@ -1,3 +1,3 @@ package com.kuit.findu.data.dataremote.util -class AuthenticationException: Exception() \ No newline at end of file +class AuthenticationException(message: String = "Session expired") : Exception(message) \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/util/SessionExpiredEventManager.kt b/app/src/main/java/com/kuit/findu/data/dataremote/util/SessionExpiredEventManager.kt new file mode 100644 index 00000000..6cac351d --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/util/SessionExpiredEventManager.kt @@ -0,0 +1,21 @@ +package com.kuit.findu.data.dataremote.util + +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.asSharedFlow +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class SessionExpiredEventManager @Inject constructor() { + private val _sessionExpiredEvent = MutableSharedFlow( + replay = 0, + extraBufferCapacity = 1, + onBufferOverflow = kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST + ) + val sessionExpiredEvent: SharedFlow = _sessionExpiredEvent.asSharedFlow() + + fun notifySessionExpired() { + _sessionExpiredEvent.tryEmit(Unit) + } +} diff --git a/app/src/main/java/com/kuit/findu/di/NetworkModule.kt b/app/src/main/java/com/kuit/findu/di/NetworkModule.kt index 11fd2163..7ace6d50 100644 --- a/app/src/main/java/com/kuit/findu/di/NetworkModule.kt +++ b/app/src/main/java/com/kuit/findu/di/NetworkModule.kt @@ -7,9 +7,11 @@ import com.kuit.findu.BuildConfig.DEBUG import com.kuit.findu.data.datalocal.datasource.TokenLocalDataSource import com.kuit.findu.data.dataremote.service.ReissueService import com.kuit.findu.data.dataremote.util.AuthAuthenticator +import com.kuit.findu.data.dataremote.util.AuthErrorInterceptor import com.kuit.findu.data.dataremote.util.AuthInterceptor import com.kuit.findu.data.dataremote.util.DiscordLogger import com.kuit.findu.data.dataremote.util.ErrorTrackingInterceptor +import com.kuit.findu.data.dataremote.util.SessionExpiredEventManager import com.kuit.findu.di.qualifier.ReissueRetrofit import dagger.Module import dagger.Provides @@ -45,6 +47,7 @@ object NetworkModule { loggingInterceptor: HttpLoggingInterceptor, authInterceptor: AuthInterceptor, authAuthenticator: AuthAuthenticator, + authErrorInterceptor: AuthErrorInterceptor, errorTrackingInterceptor: ErrorTrackingInterceptor, ): OkHttpClient = OkHttpClient.Builder().apply { @@ -52,6 +55,7 @@ object NetworkModule { writeTimeout(10, TimeUnit.SECONDS) readTimeout(10, TimeUnit.SECONDS) addInterceptor(authInterceptor) + addInterceptor(authErrorInterceptor) if (DEBUG) addInterceptor(loggingInterceptor) else addInterceptor(errorTrackingInterceptor) authenticator(authAuthenticator) @@ -75,8 +79,18 @@ object NetworkModule { fun provideAuthAuthenticator( tokenLocalDataSource: TokenLocalDataSource, reissueService: ReissueService, + sessionExpiredEventManager: SessionExpiredEventManager, ): AuthAuthenticator { - return AuthAuthenticator(tokenLocalDataSource, reissueService) + return AuthAuthenticator(tokenLocalDataSource, reissueService, sessionExpiredEventManager) + } + + @Provides + @Singleton + fun provideAuthErrorInterceptor( + tokenLocalDataSource: TokenLocalDataSource, + sessionExpiredEventManager: SessionExpiredEventManager, + ): AuthErrorInterceptor { + return AuthErrorInterceptor(tokenLocalDataSource, sessionExpiredEventManager) } @Provides diff --git a/app/src/main/java/com/kuit/findu/presentation/ui/home/HomeFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/HomeFragment.kt index 09fc114f..c6a0fc49 100644 --- a/app/src/main/java/com/kuit/findu/presentation/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/HomeFragment.kt @@ -24,7 +24,6 @@ import com.kuit.findu.presentation.ui.home.composeview.HomeScreen import com.kuit.findu.presentation.ui.home.viewmodel.HomeUiEffect import com.kuit.findu.presentation.ui.home.viewmodel.HomeUiEvent import com.kuit.findu.presentation.ui.home.viewmodel.HomeViewModel -import com.kuit.findu.presentation.ui.login.LoginActivity import com.kuit.findu.presentation.util.permission.LocationPermissionManager.hasLocationPermission import dagger.hilt.android.AndroidEntryPoint @@ -96,7 +95,6 @@ class HomeFragment : Fragment() { } is HomeUiEffect.Dial -> call120() - is HomeUiEffect.NavigateToLogin -> startLoginActivity() } } } @@ -176,12 +174,6 @@ class HomeFragment : Fragment() { ) } - private fun startLoginActivity() { - val intent = Intent(requireContext(), LoginActivity::class.java) - startActivity(intent) - requireActivity().finish() - } - private fun navigateToProtectDetail(id: String, tag: String, name: String) { when (tag) { AnimalStateType.PROTECT.state -> { diff --git a/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt index 441e43a3..43da4003 100644 --- a/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt @@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -22,8 +23,13 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp +import android.os.SystemClock +import android.util.Log import coil.compose.AsyncImage +import coil.request.ImageRequest +import com.google.firebase.perf.FirebasePerformance import com.kuit.findu.R import com.kuit.findu.domain.model.ProtectAnimal import com.kuit.findu.presentation.type.AnimalStateType @@ -48,8 +54,33 @@ fun HomeProtectAnimalCard( Box( modifier = Modifier.size(height = 100.dp, width = 120.dp), ) { + val context = LocalContext.current + val imageRequest = remember(animal.thumbnailImageUrl) { + val trace = FirebasePerformance.getInstance().newTrace("home_protect_image_load") + var startTime = 0L + ImageRequest.Builder(context) + .data(animal.thumbnailImageUrl) + .listener( + onStart = { + startTime = SystemClock.elapsedRealtime() + trace.start() + }, + onSuccess = { _, _ -> + val duration = SystemClock.elapsedRealtime() - startTime + Log.d("ImagePerf", "보호동물 이미지 로딩 완료: ${duration}ms | ${animal.thumbnailImageUrl}") + trace.stop() + }, + onError = { _, _ -> + val duration = SystemClock.elapsedRealtime() - startTime + Log.e("ImagePerf", "보호동물 이미지 로딩 실패: ${duration}ms | ${animal.thumbnailImageUrl}") + trace.putAttribute("status", "error") + trace.stop() + } + ) + .build() + } AsyncImage( - model = animal.thumbnailImageUrl, + model = imageRequest, contentDescription = "Animal Image", contentScale = ContentScale.Crop, modifier = Modifier diff --git a/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt index 0c2d009f..55e00bb3 100644 --- a/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -20,8 +21,13 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp +import android.os.SystemClock +import android.util.Log import coil.compose.AsyncImage +import coil.request.ImageRequest +import com.google.firebase.perf.FirebasePerformance import com.kuit.findu.R import com.kuit.findu.domain.model.ReportAnimal import com.kuit.findu.presentation.type.AnimalStateType @@ -43,8 +49,33 @@ fun HomeReportedAnimalCard( .background(shape = RoundedCornerShape(10.dp), color = FindUTheme.colors.white) .noRippleClickable { navigateToReportDetail(animal) } ) { + val context = LocalContext.current + val imageRequest = remember(animal.thumbnailImageUrl) { + val trace = FirebasePerformance.getInstance().newTrace("home_report_image_load") + var startTime = 0L + ImageRequest.Builder(context) + .data(animal.thumbnailImageUrl) + .listener( + onStart = { + startTime = SystemClock.elapsedRealtime() + trace.start() + }, + onSuccess = { _, _ -> + val duration = SystemClock.elapsedRealtime() - startTime + Log.d("ImagePerf", "제보동물 이미지 로딩 완료: ${duration}ms | ${animal.thumbnailImageUrl}") + trace.stop() + }, + onError = { _, _ -> + val duration = SystemClock.elapsedRealtime() - startTime + Log.e("ImagePerf", "제보동물 이미지 로딩 실패: ${duration}ms | ${animal.thumbnailImageUrl}") + trace.putAttribute("status", "error") + trace.stop() + } + ) + .build() + } AsyncImage( - model = animal.thumbnailImageUrl, + model = imageRequest, contentDescription = "Animal Image", contentScale = ContentScale.Crop, modifier = Modifier diff --git a/app/src/main/java/com/kuit/findu/presentation/ui/home/viewmodel/HomeViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/viewmodel/HomeViewModel.kt index c4cda3eb..88f77df6 100644 --- a/app/src/main/java/com/kuit/findu/presentation/ui/home/viewmodel/HomeViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/viewmodel/HomeViewModel.kt @@ -3,7 +3,6 @@ package com.kuit.findu.presentation.ui.home.viewmodel import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.kuit.findu.data.dataremote.util.AuthenticationException import com.kuit.findu.domain.model.HomeData import com.kuit.findu.domain.model.ProtectAnimal import com.kuit.findu.domain.model.ReportAnimal @@ -14,6 +13,7 @@ import com.kuit.findu.presentation.type.HomeReportDurationType import com.kuit.findu.presentation.type.HomeUserStatusType import com.kuit.findu.presentation.type.view.LoadState import com.kuit.findu.presentation.util.Nickname.GUEST_NAME +import com.google.firebase.perf.FirebasePerformance import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow @@ -79,7 +79,6 @@ sealed class HomeUiEffect { data class ShowToast(val message: String) : HomeUiEffect() data object Dial : HomeUiEffect() - data object NavigateToLogin : HomeUiEffect() } @HiltViewModel @@ -137,8 +136,14 @@ class HomeViewModel @Inject constructor( private fun loadHomeData() { viewModelScope.launch { _uiState.update { it.copy(loadState = LoadState.Loading) } + val trace = FirebasePerformance.getInstance().newTrace("home_data_load") + trace.start() homeUseCase().fold( onSuccess = { data -> + trace.putAttribute("status", "success") + trace.putMetric("protect_animal_count", data.protectAnimalCards.size.toLong()) + trace.putMetric("report_animal_count", data.reportAnimalCards.size.toLong()) + trace.stop() _uiState.update { it.copy( loadState = LoadState.Success, @@ -148,11 +153,9 @@ class HomeViewModel @Inject constructor( } }, onFailure = { error -> + trace.putAttribute("status", "failure") + trace.stop() Log.e("HomeViewModel", "loadHomeData: $error") - if(error.message?.contains("401") == true) { - _uiEffect.send(HomeUiEffect.NavigateToLogin) - return@fold - } _uiState.update { it.copy( loadState = LoadState.Error, diff --git a/build.gradle.kts b/build.gradle.kts index ebcb5dfd..ff38d455 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,4 +6,5 @@ plugins { alias(libs.plugins.navigationSafeArgs) apply false alias(libs.plugins.googleServices) apply false alias(libs.plugins.firebaseCrashlytics) apply false + alias(libs.plugins.firebasePerf) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0e29bbf2..b8333821 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ coilCompose = "2.5.0" composeBom = "2024.04.01" firebaseBom = "34.6.0" firebaseCrashlytics = "3.0.6" +firebasePerf = "2.0.2" googleServices = "4.4.2" kotlin = "2.0.21" coreKtx = "1.15.0" @@ -54,6 +55,7 @@ firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "fir firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics" } firebase-config-ktx = { module = "com.google.firebase:firebase-config" } firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics"} +firebase-perf = { module = "com.google.firebase:firebase-perf" } junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } @@ -105,6 +107,7 @@ dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "daggerHilt navigationSafeArgs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigationFragmentKtx" } googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" } firebaseCrashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlytics" } +firebasePerf = { id = "com.google.firebase.firebase-perf", version.ref = "firebasePerf" } [bundles] hilt = [