Merge branch 'release/v2.2.1' into develop

unam98 · unam98 · commit ca41de761496 · 2026-04-11T14:30:44.000+09:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -74,12 +74,18 @@ android {
         }
     }
 
+    packaging {
+        jniLibs {
+            useLegacyPackaging = false
+        }
+    }
+
     applicationVariants.all { variant ->
         variant.outputs.all {
             def timestamp = new Date().format('yyyyMMdd_HHmmss')
             def versionName = variant.versionName
             def ext = outputFileName.endsWith('.aab') ? 'aab' : 'apk'
-            outputFileName = "Runnect-${variant.buildType.name}-v${versionName}-${timestamp}.${ext}"
+            outputFileName = "v${versionName}-${variant.buildType.name}-${timestamp}.${ext}"
         }
     }
 
@@ -93,6 +99,25 @@ android {
     }
 }
 
+tasks.register('renameReleaseBundle') {
+    def vName = libs.versions.versionName.get()
+    def bundlePath = layout.buildDirectory.dir("outputs/bundle/release")
+
+    doLast {
+        def timestamp = new Date().format('yyyyMMdd_HHmmss')
+        bundlePath.get().asFile.listFiles()?.findAll { it.name.endsWith('.aab') }?.each { aab ->
+            def newName = "v${vName}-release-${timestamp}.aab"
+            def newFile = new File(aab.parentFile, newName)
+            aab.renameTo(newFile)
+            println "AAB renamed: ${newFile.name}"
+        }
+    }
+}
+
+tasks.matching { it.name == 'bundleRelease' }.configureEach {
+    finalizedBy 'renameReleaseBundle'
+}
+
 dependencies {
     // AndroidX
     implementation libs.androidx.core.ktx
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -11,6 +11,18 @@
 -keepattributes SourceFile,LineNumberTable
 -keep public class * extends java.lang.Exception
 
+# --- DTO ---
+# RetrofitV2/RetrofitFlow가 GsonConverterFactory를 사용하므로
+# Gson 리플렉션으로 직렬화되는 DTO 필드명 보존 필요
+-keepclassmembers class com.runnect.runnect.data.dto.** { <fields>; }
+
+# --- Retrofit + kotlin.Result ---
+# kotlin.Result는 inline class라 R8이 제네릭 타입 정보를 최적화함
+# Retrofit이 Call<Result<T>>의 타입 파라미터를 리플렉션으로 읽지 못해 CallAdapter 생성 실패
+# https://github.com/square/retrofit/issues/3880
+-keep class kotlin.Result { *; }
+-keepattributes Signature
+
 # --- Kakao SDK ---
 # 공식 문서: https://developers.kakao.com/docs/latest/en/android/getting-started#configure-for-shrinking-and-obfuscation-(optional)
 -keep class com.kakao.sdk.**.model.* { <fields>; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Runnect"
         android:usesCleartextTraffic="true"
+        android:extractNativeLibs="false"
         tools:targetApi="tiramisu">
 
         <service
@@ -158,6 +159,9 @@
         <activity
             android:name=".presentation.mypage.upload.MyUploadActivity"
             android:exported="false" />
+        <activity
+            android:name=".presentation.mypage.setting.MySettingActivity"
+            android:exported="false" />
         <activity
             android:name=".presentation.profile.ProfileActivity"
             android:exported="false" />
diff --git a/app/src/main/java/com/runnect/runnect/data/network/calladapter/ResultCall.kt b/app/src/main/java/com/runnect/runnect/data/network/calladapter/ResultCall.kt
@@ -1,8 +1,10 @@
 package com.runnect.runnect.data.network.calladapter
 
-import com.google.gson.Gson
-import com.runnect.runnect.data.dto.response.base.ErrorResponse
 import com.runnect.runnect.domain.common.RunnectException
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -11,7 +13,7 @@ import okio.Timeout
 
 class ResultCall<T>(private val call: Call<T>) : Call<Result<T>> {
 
-    private val gson = Gson()
+    private val json = Json { ignoreUnknownKeys = true }
 
     override fun execute(): Response<Result<T>> {
         throw UnsupportedOperationException("ResultCall doesn't support execute")
@@ -46,23 +48,17 @@ class ResultCall<T>(private val call: Call<T>) : Call<Result<T>> {
     }
 
     private fun parseErrorResponse(response: Response<*>): RunnectException {
-        val errorJson = response.errorBody()?.string()
+        val errorString = response.errorBody()?.string()
 
         return runCatching {
-            val errorBody = gson.fromJson(errorJson, ErrorResponse::class.java)
-            val message = errorBody?.run {
-                message ?: error ?: ERROR_MSG_COMMON
-            }
-
-            RunnectException(
-                code = errorBody.status,
-                message = message
-            )
+            val jsonObject = json.parseToJsonElement(errorString.orEmpty()).jsonObject
+            val status = jsonObject["status"]?.jsonPrimitive?.int ?: response.code()
+            val message = jsonObject["message"]?.jsonPrimitive?.content
+                ?: jsonObject["error"]?.jsonPrimitive?.content
+                ?: ERROR_MSG_COMMON
+            RunnectException(code = status, message = message)
         }.getOrElse {
-            RunnectException(
-                code = response.code(),
-                message = ERROR_MSG_COMMON
-            )
+            RunnectException(code = response.code(), message = ERROR_MSG_COMMON)
         }
     }
 
diff --git a/app/src/main/java/com/runnect/runnect/data/network/calladapter/flow/FlowCallAdapter.kt b/app/src/main/java/com/runnect/runnect/data/network/calladapter/flow/FlowCallAdapter.kt
@@ -1,11 +1,12 @@
 package com.runnect.runnect.data.network.calladapter.flow
 
-import com.google.gson.Gson
-import com.runnect.runnect.data.dto.response.base.ErrorResponse
 import com.runnect.runnect.domain.common.RunnectException
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import retrofit2.Call
 import retrofit2.CallAdapter
 import retrofit2.Callback
@@ -18,7 +19,7 @@ class FlowCallAdapter<T>(
     private val responseType: Type
 ) : CallAdapter<T, Flow<Result<T>>> {
 
-    private val gson = Gson()
+    private val json = Json { ignoreUnknownKeys = true }
     override fun responseType() = responseType
 
     // Retrofit의 Call을 Result<>로 변환
@@ -58,15 +59,18 @@ class FlowCallAdapter<T>(
         } ?: Result.failure(nullBodyException)
     }
 
-    // Response에서 오류를 파싱하여 RunnectException 객체를 생성
     private fun parseErrorResponse(response: Response<*>): RunnectException {
         val errorBodyString = response.errorBody()?.string()
-        val errorResponse = errorBodyString?.let {
-            gson.fromJson(it, ErrorResponse::class.java)
-        }
 
-        val errorMessage = errorResponse?.message ?: errorResponse?.error ?: ERROR_MSG_COMMON
-        return RunnectException(response.code(), errorMessage)
+        return runCatching {
+            val jsonObject = json.parseToJsonElement(errorBodyString.orEmpty()).jsonObject
+            val message = jsonObject["message"]?.jsonPrimitive?.content
+                ?: jsonObject["error"]?.jsonPrimitive?.content
+                ?: ERROR_MSG_COMMON
+            RunnectException(response.code(), message)
+        }.getOrElse {
+            RunnectException(response.code(), ERROR_MSG_COMMON)
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/runnect/runnect/data/network/interceptor/ResponseInterceptor.kt b/app/src/main/java/com/runnect/runnect/data/network/interceptor/ResponseInterceptor.kt
@@ -1,11 +1,8 @@
 package com.runnect.runnect.data.network.interceptor
 
-import com.google.gson.Gson
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.google.gson.JsonParseException
-import com.google.gson.JsonSyntaxException
-import com.runnect.runnect.data.dto.response.base.BaseResponse
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonObject
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Response
@@ -18,14 +15,14 @@ import timber.log.Timber
  */
 class ResponseInterceptor : Interceptor {
 
-    private val gson = Gson()
+    private val json = Json { ignoreUnknownKeys = true }
 
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalResponse = chain.proceed(chain.request())
         if (!originalResponse.isSuccessful) return originalResponse
 
         val bodyString = originalResponse.peekBody(Long.MAX_VALUE).string()
-        val newResponseBodyString = jsonToBaseResponse(bodyString)?.let {
+        val newResponseBodyString = extractData(bodyString)?.let {
             it.toResponseBody("application/json".toMediaTypeOrNull())
         } ?: return originalResponse
 
@@ -42,26 +39,18 @@ class ResponseInterceptor : Interceptor {
             }
     }
 
-    private fun jsonToBaseResponse(body: String): String? {
+    private fun extractData(body: String): String? {
         return try {
-            val jsonElement: JsonElement = gson.fromJson(body, JsonElement::class.java)
-            if (!isBaseResponse(jsonElement.asJsonObject)) {
-                return null
-            }
-
-            val baseResponse = gson.fromJson(body, BaseResponse::class.java)
-            gson.toJson(baseResponse.data)
-        } catch (e: JsonSyntaxException) {
-            null // JSON 구문 분석 오류 발생 시 원래 형식을 반환
-        } catch (e: JsonParseException) {
-            null // JSON 파싱 오류 발생 시 원래 형식을 반환
+            val jsonObject = json.parseToJsonElement(body).jsonObject
+            if (!isBaseResponse(jsonObject)) return null
+            jsonObject["data"].toString()
         } catch (e: Exception) {
-            null // 기타 예외 발생 시 원래 형식을 반환
+            null
         }
     }
 
     private fun isBaseResponse(jsonObject: JsonObject): Boolean {
         val requiredFields = listOf("status", "success", "message", "data")
-        return requiredFields.all { jsonObject.has(it) }
+        return requiredFields.all { it in jsonObject }
     }
 }
diff --git a/app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailActivity.kt
@@ -79,7 +79,7 @@ class CourseDetailActivity :
     private var isFromDeepLink: Boolean = false
 
     // 인텐트 부가 데이터
-    private lateinit var rootScreen: CourseDetailRootScreen
+    private var rootScreen: CourseDetailRootScreen? = null
     private var publicCourseId: Int = -1
 
     // 서버통신으로 초기화 할 데이터
@@ -407,9 +407,13 @@ class CourseDetailActivity :
             COURSE_STORAGE_SCRAP -> lifecycleScope.launch {
                 screenRefreshEventBus.emit(ScreenRefreshEvent.RefreshStorageScrap)
             }
-            COURSE_DISCOVER -> setActivityResult<MainActivity>()
             COURSE_DISCOVER_SEARCH -> setActivityResult<DiscoverSearchActivity>()
             MY_PAGE_UPLOAD_COURSE -> setActivityResult<MyUploadActivity>()
+            COURSE_DISCOVER -> { /* finish()로 이전 MainActivity(코스 발견 탭)로 복귀 */ }
+            null -> {
+                navigateToMainScreen()
+                return
+            }
         }
 
         finish()
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageFragment.kt
@@ -14,8 +14,6 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.commit
-import androidx.fragment.app.replace
 import com.kakao.sdk.common.util.KakaoCustomTabsClient
 import com.kakao.sdk.talk.TalkApiClient
 import com.runnect.runnect.BuildConfig
@@ -25,7 +23,7 @@ import com.runnect.runnect.presentation.login.LoginActivity
 import com.runnect.runnect.presentation.mypage.editname.MyPageEditNameActivity
 import com.runnect.runnect.presentation.mypage.history.MyHistoryActivity
 import com.runnect.runnect.presentation.mypage.reward.MyRewardActivity
-import com.runnect.runnect.presentation.mypage.setting.MySettingFragment
+import com.runnect.runnect.presentation.mypage.setting.MySettingActivity
 import com.runnect.runnect.presentation.mypage.upload.MyUploadActivity
 import com.runnect.runnect.presentation.ui.theme.RunnectTheme
 import com.runnect.runnect.util.analytics.Analytics
@@ -122,11 +120,11 @@ class MyPageFragment : Fragment() {
     }
 
     private fun moveToSettingFragment() {
-        val bundle = Bundle().apply { putString(ACCOUNT_INFO_TAG, viewModel.currentState.email) }
-        requireActivity().supportFragmentManager.commit {
-            setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left)
-            replace<MySettingFragment>(R.id.fl_main, args = bundle)
+        val intent = Intent(requireContext(), MySettingActivity::class.java).apply {
+            putExtra(ACCOUNT_INFO_TAG, viewModel.currentState.email)
         }
+        startActivity(intent)
+        requireActivity().overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left)
     }
 
     private fun inquiryKakao() {
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/setting/MySettingActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/setting/MySettingActivity.kt
@@ -0,0 +1,29 @@
+package com.runnect.runnect.presentation.mypage.setting
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.commit
+import androidx.fragment.app.replace
+import com.runnect.runnect.R
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MySettingActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_my_setting)
+
+        if (savedInstanceState == null) {
+            val bundle = Bundle().apply {
+                putString(
+                    MySettingFragment.ACCOUNT_INFO_TAG,
+                    intent.getStringExtra(MySettingFragment.ACCOUNT_INFO_TAG)
+                )
+            }
+            supportFragmentManager.commit {
+                replace<MySettingFragment>(R.id.fl_main, args = bundle)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/setting/MySettingFragment.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/setting/MySettingFragment.kt
@@ -12,7 +12,6 @@ import com.runnect.runnect.BuildConfig
 import com.runnect.runnect.R
 import com.runnect.runnect.binding.BindingFragment
 import com.runnect.runnect.databinding.FragmentMySettingBinding
-import com.runnect.runnect.presentation.mypage.MyPageFragment
 import com.runnect.runnect.presentation.mypage.setting.accountinfo.MySettingAccountInfoFragment
 import com.runnect.runnect.util.extension.showWebBrowser
 
@@ -57,10 +56,8 @@ class MySettingFragment : BindingFragment<FragmentMySettingBinding>(R.layout.fra
     }
 
     private fun navigateToMyPageFragment() {
-        parentFragmentManager.commit {
-            setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right)
-            replace<MyPageFragment>(R.id.fl_main)
-        }
+        requireActivity().finish()
+        requireActivity().overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right)
     }
 
     private fun moveToMySettingAccountInfo() {
diff --git a/app/src/main/res/layout/activity_my_setting.xml b/app/src/main/res/layout/activity_my_setting.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fl_main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true" />
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,8 +5,8 @@ minSdk = "28"
 targetSdk = "35"
 
 # App
-versionCode = "28"
-versionName = "2.2.0"
+versionCode = "30"
+versionName = "2.2.1"
 
 # Gradle plugins
 agp = "8.13.2"
