[Fix] 네트워크 없을 때 앱이 종료되도록 설계된 것을 dialog만 띄우도록 수정

app/src/main/AndroidManifest.xml

@@ -183,9 +183,6 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity
-            android:name=".presentation.error.ServerErrorActivity"
-            android:exported="false" />
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">

app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt

@@ -69,6 +69,7 @@ abstract class BaseActivity<B : ViewBinding>(
 
         // refreshtoken 관리
         observeTokenExpiration()
+        observeNetworkError()
 
         setContainerInset()
 
@@ -120,8 +121,6 @@ abstract class BaseActivity<B : ViewBinding>(
                 navigateToLogin()
             }
         }
-
-        observeNetworkError()
     }
 
     private fun navigateToLogin() {

app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt

@@ -37,6 +37,7 @@ class IntroActivity : AppCompatActivity() {
 
         observeState()
         observeEvents()
+        observeNetworkError()
 
         lifecycleScope.launch {
             // 버전 체크 결과 관찰
@@ -88,8 +89,6 @@ class IntroActivity : AppCompatActivity() {
                 }
             }
         }
-
-        observeNetworkError()
     }
 
     private fun log() {

app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt

@@ -1,39 +1,51 @@
 package com.eatssu.android.presentation.util
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.eatssu.android.R
 import com.eatssu.android.presentation.base.NetworkErrorEventBus
-import com.eatssu.android.presentation.error.ServerErrorActivity
 import kotlinx.coroutines.launch
 
 inline fun <reified T : Activity> AppCompatActivity.startActivity(block: Intent.() -> Unit = {}) {
     startActivity(Intent(this, T::class.java).apply(block))
 }
 
 /**
- * NetworkErrorEventBus를 구독하여 네트워크 에러 발생 시 ServerErrorActivity로 이동합니다.
+ * NetworkErrorEventBus를 구독하여 네트워크 에러 발생 시 다이얼로그를 표시합니다.
+ * 액티비티를 종료하지 않아 진행 중인 요청이 취소되지 않습니다.
  */
 fun AppCompatActivity.observeNetworkError(
     errorTitle: String? = null,
     errorMessage: String? = null
 ) {
+    var networkErrorDialog: AlertDialog? = null
+
     lifecycleScope.launch {
         NetworkErrorEventBus.networkError.collect {
-            val intent = Intent(this@observeNetworkError, ServerErrorActivity::class.java).apply {
-                putExtra(
-                    ServerErrorActivity.EXTRA_TITLE,
-                    errorTitle ?: getString(R.string.server_error_title)
-                )
-                putExtra(
-                    ServerErrorActivity.EXTRA_MESSAGE,
-                    errorMessage ?: getString(R.string.server_error_message)
-                )
+            if (networkErrorDialog?.isShowing == true) {
+                return@collect
             }
-            startActivity(intent)
-            finish()
+
+            val title = errorTitle ?: getString(R.string.server_error_title)
+            val message = errorMessage ?: getString(R.string.server_error_message)
+
+            networkErrorDialog = AlertDialog.Builder(this@observeNetworkError)
+                .setTitle(title)
+                .setMessage(message)
+                .setPositiveButton(getString(R.string.confirm)) { dialog, _ ->
+                    dialog.dismiss()
+                }
+                .setCancelable(true)
+                .create()
+                .also { dialog ->
+                    dialog.setOnDismissListener {
+                        networkErrorDialog = null
+                    }
+                    dialog.show()
+                }
         }
     }
 }