Merge branch 'develop' of https://github.com/Team-Wable/WABLE-ANDROID …

…into hotfix/#94-team-tag
Team-Wable · Oct 11, 2024 · 9c37662 · 9c37662
2 parents 76c91a4 + f16ab43
commit 9c37662
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -33,5 +33,4 @@ dependencies {
     implementation(project(":core:model"))
     implementation(project(":core:datastore"))
     implementation(libs.paging)
-    implementation(libs.process.phoenix)
 }
diff --git a/core/network/src/main/java/com/teamwable/network/TokenInterceptor.kt b/core/network/src/main/java/com/teamwable/network/TokenInterceptor.kt
@@ -1,20 +1,17 @@
 package com.teamwable.network
 
 import android.app.Application
+import android.content.Intent
 import android.widget.Toast
-import com.jakewharton.processphoenix.ProcessPhoenix
 import com.teamwable.datastore.datasource.DefaultWablePreferenceDatasource
 import com.teamwable.network.datasource.AuthService
-import com.teamwable.network.util.UNKNOWN_ERROR_MESSAGE
-import com.teamwable.network.util.toCustomError
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
@@ -68,19 +65,22 @@ class TokenInterceptor @Inject constructor(
                     false -> false
                 }
             } catch (e: Exception) {
-                val errorMessage = e.toCustomError().message ?: UNKNOWN_ERROR_MESSAGE
-                Toast.makeText(context, errorMessage, Toast.LENGTH_SHORT).show()
                 false
             }
         }
     }
 
-    private fun handleFailedTokenReissue() {
+    private fun handleFailedTokenReissue() = with(context) {
         CoroutineScope(Dispatchers.Main).launch {
-            withContext(Dispatchers.IO) {
-                defaultWablePreferenceDatasource.clear()
-            }
-            ProcessPhoenix.triggerRebirth(context)
+            defaultWablePreferenceDatasource.clear()
+            startActivity(
+                Intent.makeRestartActivityTask(
+                    packageManager.getLaunchIntentForPackage(packageName)?.component,
+                ).apply {
+                    addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+                },
+            )
+            Toast.makeText(context, "재 로그인이 필요해요", Toast.LENGTH_SHORT).show()
         }
     }
 

diff --git a/.../network/src/main/java/com/teamwable/network/dto/response/auth/ResponseReissueTokenDto.kt b/.../network/src/main/java/com/teamwable/network/dto/response/auth/ResponseReissueTokenDto.kt
@@ -7,4 +7,6 @@ import kotlinx.serialization.Serializable
 data class ResponseReissueTokenDto(
     @SerialName("accessToken")
     val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
 )
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -147,7 +147,6 @@ lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", versio
 amplitude = { module = "com.amplitude:analytics-android", version.ref = "amplitude" }
 amplitude-ads = { module = "com.google.android.gms:play-services-ads-identifier", version.ref = "amplitude-ads" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
-process-phoenix = { group = "com.jakewharton", name = "process-phoenix", version.ref = "processPhoenix" }
 
 ## Compose
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }