Refactor/android/exception catch: Exception 분기 처리 및 가로모드 대응 추가

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/CalendarRepository.kt

@@ -7,6 +7,7 @@ import com.teameetmeet.meetmeet.data.network.entity.AddEventRequest
 import com.teameetmeet.meetmeet.data.network.entity.EventResponse
 import com.teameetmeet.meetmeet.data.network.entity.UserEventResponse
 import com.teameetmeet.meetmeet.data.toEvent
+import com.teameetmeet.meetmeet.data.toException
 import com.teameetmeet.meetmeet.presentation.model.EventColor
 import com.teameetmeet.meetmeet.presentation.model.EventNotification
 import com.teameetmeet.meetmeet.util.date.DateTimeFormat
@@ -71,7 +72,7 @@ class CalendarRepository @Inject constructor(
         )
         return remoteCalendarDataSource.addEvent(request)
             .catch {
-                throw it
+                throw it.toException()
             }
     }
 

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/EventStoryRepository.kt

@@ -190,7 +190,7 @@ class EventStoryRepository @Inject constructor(
                 val request = EventInviteRequest(userId = userId, eventId = eventId)
                 eventStoryApi.inviteEvent(request)
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -199,7 +199,7 @@ class EventStoryRepository @Inject constructor(
             .map {
                 eventStoryApi.getFollowingWithEventStatus(eventId).users
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -208,7 +208,7 @@ class EventStoryRepository @Inject constructor(
             .map {
                 eventStoryApi.getFollowerWithEventStatus(eventId).users
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/FollowRepository.kt

@@ -37,7 +37,7 @@ class FollowRepository @Inject constructor(
             .map {
                 followApi.getFollowingWithFollowStatus().users
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -46,7 +46,7 @@ class FollowRepository @Inject constructor(
             .map {
                 followApi.getFollowerWithFollowStatus().users
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 }

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/LoginRepository.kt

@@ -4,6 +4,7 @@ import com.teameetmeet.meetmeet.data.local.datastore.DataStoreHelper
 import com.teameetmeet.meetmeet.data.network.api.LoginApi
 import com.teameetmeet.meetmeet.data.network.entity.KakaoLoginRequest
 import com.teameetmeet.meetmeet.data.network.entity.SelfSignRequest
+import com.teameetmeet.meetmeet.data.toException
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flowOf
@@ -33,7 +34,7 @@ class LoginRepository @Inject constructor(
                 val response = loginApi.loginSelf(request)
                 storeAppToken(response.accessToken, response.refreshToken)
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -43,7 +44,7 @@ class LoginRepository @Inject constructor(
                 val response = loginApi.checkEmailDuplication(email)
                 response.isAvailable
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -55,7 +56,7 @@ class LoginRepository @Inject constructor(
                 val response = loginApi.loginSelf(request)
                 storeAppToken(response.accessToken, response.refreshToken)
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/UserRepository.kt

@@ -105,7 +105,7 @@ class UserRepository @Inject constructor(
                 dataStore.deleteUserProfile()
                 dataStore.deleteAppToken()
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -115,7 +115,7 @@ class UserRepository @Inject constructor(
                 val response = userApi.checkNickNameDuplication(nickname)
                 response.isAvailable
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -124,7 +124,7 @@ class UserRepository @Inject constructor(
             .map {
                 userApi.patchPassword(PasswordChangeRequest(password))
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -133,7 +133,7 @@ class UserRepository @Inject constructor(
             .map {
                 userApi.patchNickname(NicknameChangeRequest(nickname))
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 
@@ -157,7 +157,7 @@ class UserRepository @Inject constructor(
                 userApi.updateProfileImage(profileImageRequest)
                 imageFile?.delete()
             }.catch {
-                throw it
+                throw it.toException()
             }
     }
 

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/addevent/AddEventActivity.kt

@@ -73,13 +73,16 @@ class AddEventActivity : BaseActivity<ActivityAddEventBinding>(R.layout.activity
                 viewModel.event.collect { event ->
                     when (event) {
                         is AddEventUiEvent.ShowMessage -> showMessage(
-                            event.messageId,
-                            event.extraMessage
+                            event.messageId, event.extraMessage
                         )
 
                         is AddEventUiEvent.FinishAddEventActivity -> {
                             finish()
                         }
+
+                        is AddEventUiEvent.NavigateToLoginActivity -> {
+                            navigateToLoginActivity()
+                        }
                     }
                 }
             }
@@ -120,15 +123,13 @@ class AddEventActivity : BaseActivity<ActivityAddEventBinding>(R.layout.activity
     }
 
     private fun setDateTimePicker() {
-        val dateRangePicker =
-            MaterialDatePicker.Builder.dateRangePicker()
-                .setTitleText(getString(R.string.add_event_title))
-                .setSelection(
-                    Pair(
-                        viewModel.uiState.value.startDate.toLong(ZoneId.of("UTC")),
-                        viewModel.uiState.value.endDate.toLong(ZoneId.of("UTC"))
-                    )
-                ).build()
+        val dateRangePicker = MaterialDatePicker.Builder.dateRangePicker()
+            .setTitleText(getString(R.string.add_event_title)).setSelection(
+                Pair(
+                    viewModel.uiState.value.startDate.toLong(ZoneId.of("UTC")),
+                    viewModel.uiState.value.endDate.toLong(ZoneId.of("UTC"))
+                )
+            ).build()
 
         dateRangePicker.addOnPositiveButtonClickListener {
             viewModel.setEventDate(
@@ -157,8 +158,7 @@ class AddEventActivity : BaseActivity<ActivityAddEventBinding>(R.layout.activity
         val startTimePicker = MaterialTimePicker.Builder().setTimeFormat(TimeFormat.CLOCK_12H)
             .setHour(viewModel.uiState.value.startTime.hour)
             .setMinute(viewModel.uiState.value.startTime.minute)
-            .setTitleText(getString(R.string.add_event_err_start_time))
-            .build()
+            .setTitleText(getString(R.string.add_event_err_start_time)).build()
 
         startTimePicker.addOnPositiveButtonClickListener {
             viewModel.setEventStartTime(startTimePicker.hour, startTimePicker.minute)

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/addevent/AddEventUiEvent.kt

@@ -1,6 +1,11 @@
 package com.teameetmeet.meetmeet.presentation.addevent
 
+import androidx.annotation.StringRes
+
 sealed class AddEventUiEvent {
-    data class ShowMessage(val messageId: Int, val extraMessage: String = "") : AddEventUiEvent()
+    data class ShowMessage(@StringRes val messageId: Int, val extraMessage: String = "") :
+        AddEventUiEvent()
+
     data object FinishAddEventActivity : AddEventUiEvent()
+    data object NavigateToLoginActivity : AddEventUiEvent()
 }

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/addevent/AddEventViewModel.kt

@@ -1,9 +1,11 @@
 package com.teameetmeet.meetmeet.presentation.addevent
 
 import android.widget.RadioGroup
+import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.teameetmeet.meetmeet.R
+import com.teameetmeet.meetmeet.data.ExpiredRefreshTokenException
 import com.teameetmeet.meetmeet.data.network.entity.EventResponse
 import com.teameetmeet.meetmeet.data.repository.CalendarRepository
 import com.teameetmeet.meetmeet.presentation.model.EventColor
@@ -26,6 +28,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import java.net.UnknownHostException
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.temporal.ChronoUnit
@@ -37,10 +40,6 @@ class AddEventViewModel @Inject constructor(
     private val alarmHelper: AlarmHelper
 ) : ViewModel() {
 
-    companion object {
-        const val MAX_ALARM_COUNT = 2
-    }
-
     private val _uiState = MutableStateFlow(AddEventUiState())
     val uiState: StateFlow<AddEventUiState> = _uiState
 
@@ -84,16 +83,17 @@ class AddEventViewModel @Inject constructor(
                         color = color,
                         alarm = alarm,
                     ).catch {
-                        _event.emit(AddEventUiEvent.ShowMessage(R.string.add_event_err_fail))
+                        emitExceptionEvent(it, R.string.add_event_err_fail)
+                        _showPlaceholder.update { false }
                     }.collectLatest { events ->
                         events.take(MAX_ALARM_COUNT).forEach { event ->
                             setAlarm(event)
                         }
+                        _event.emit(AddEventUiEvent.FinishAddEventActivity)
+                        _showPlaceholder.update { false }
                     }
-                    _event.emit(AddEventUiEvent.FinishAddEventActivity)
                 }
             }
-            _showPlaceholder.update { false }
         }
     }
 
@@ -159,7 +159,23 @@ class AddEventViewModel @Inject constructor(
                 )
             }
         }
+    }
+
+    private suspend fun emitExceptionEvent(e: Throwable, @StringRes message: Int) {
+        when (e) {
+            is ExpiredRefreshTokenException -> {
+                _event.emit(AddEventUiEvent.ShowMessage(R.string.common_message_expired_login))
+                _event.emit(AddEventUiEvent.NavigateToLoginActivity)
+            }
 
+            is UnknownHostException -> {
+                _event.emit(AddEventUiEvent.ShowMessage(R.string.common_message_no_internet))
+            }
+
+            else -> {
+                _event.emit(AddEventUiEvent.ShowMessage(message))
+            }
+        }
     }
 
     fun setEventMemo(memo: CharSequence) {
@@ -225,4 +241,8 @@ class AddEventViewModel @Inject constructor(
             it.copy(color = EventColor.values()[index])
         }
     }
+
+    companion object {
+        const val MAX_ALARM_COUNT = 2
+    }
 }

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

@@ -1,10 +1,12 @@
 package com.teameetmeet.meetmeet.presentation.base
 
+import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
+import com.teameetmeet.meetmeet.presentation.login.LoginActivity
 
 abstract class BaseActivity<T : ViewDataBinding>(private val layoutResId: Int) :
     AppCompatActivity() {
@@ -28,4 +30,9 @@ abstract class BaseActivity<T : ViewDataBinding>(private val layoutResId: Int) :
             Toast.makeText(this, getString(messageId), Toast.LENGTH_SHORT).show()
         }
     }
+
+    protected fun navigateToLoginActivity() {
+        startActivity(Intent(this, LoginActivity::class.java))
+        finishAffinity()
+    }
 }

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/base/BaseFragment.kt

@@ -1,5 +1,6 @@
 package com.teameetmeet.meetmeet.presentation.base
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -8,6 +9,7 @@ import android.widget.Toast
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
+import com.teameetmeet.meetmeet.presentation.login.LoginActivity
 
 abstract class BaseFragment<T : ViewDataBinding>(private val layoutResId: Int) : Fragment() {
 
@@ -38,4 +40,9 @@ abstract class BaseFragment<T : ViewDataBinding>(private val layoutResId: Int) :
             Toast.makeText(requireContext(), getString(messageId), Toast.LENGTH_SHORT).show()
         }
     }
+
+    protected fun navigateToLoginActivity() {
+        startActivity(Intent(requireActivity(), LoginActivity::class.java))
+        requireActivity().finishAffinity()
+    }
 }

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/eventstory/eventstory/EventStoryFragment.kt

@@ -125,12 +125,6 @@ class EventStoryFragment : BaseFragment<FragmentEventStoryBinding>(R.layout.frag
         }
     }
 
-    private fun navigateToLoginActivity() {
-        findNavController().navigate(EventStoryFragmentDirections.actionEventStoryFragmentToLoginActivity())
-        requireActivity().finishAffinity()
-    }
-
-
     private fun navigateToEventDetailFragment() {
         findNavController().navigate(
             EventStoryFragmentDirections.actionEventStoryFragmentToEventStoryDetailFragment(

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/eventstory/eventstorydetail/EventStoryDetailFragment.kt

@@ -130,11 +130,6 @@ class EventStoryDetailFragment :
         binding.vm = viewModel
     }
 
-    private fun navigateToLoginActivity() {
-        findNavController().navigate(EventStoryDetailFragmentDirections.actionEventStoryDetailFragmentToLoginActivity())
-        requireActivity().finishAffinity()
-    }
-
     private fun setRepeatOptions() {
         binding.storyDetailEtEventRepeat.setOnItemClickListener { _, _, index, _ ->
             viewModel.setEventRepeat(index)