[PR] Minor changes on 1.4.2

app/src/main/java/com/doyoonkim/knutice/AppNavHost.kt

@@ -17,7 +17,8 @@ fun AppNavHost(
     modifier: Modifier = Modifier,
     contentPadding: PaddingValues,
     navController: NavHostController,
-    viewModelFactory: ViewModelProvider.Factory
+    viewModelFactory: ViewModelProvider.Factory,
+    onExit: () -> Unit = { /* ON EXIT HANDLING */ }
 ) {
     NavHost(
         modifier = modifier.padding(
@@ -38,7 +39,8 @@ fun AppNavHost(
             },
             onBookmarkServiceRequested = {
                 navController.navigate("bookmark/${it.noticeId}/${it.noticeTitle}/${it.noticeInfo}")
-            }
+            },
+            onExit = onExit
         )
 
         bookmarkServiceGraph(
@@ -47,7 +49,8 @@ fun AppNavHost(
             contentPadding = contentPadding,
             onNoticeDetailRequested = { target ->
                 navController.navigate("noticeDetail/${target.nttId}/${Uri.encode(target.contentUrl)}/${target.isFabVisible}")
-            }
+            },
+            onExit = onExit
         )
     }
 }

app/src/main/java/com/doyoonkim/knutice/MainActivity.kt

@@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -67,6 +66,7 @@ import com.doyoonkim.common.theme.title
 import com.doyoonkim.common.ui.PermissionRationaleComposable
 import com.doyoonkim.common.R
 import com.doyoonkim.notification.local.NotificationAlarmScheduler
+import kotlinx.coroutines.delay
 import javax.inject.Inject
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -121,6 +121,7 @@ class MainActivity : ComponentActivity() {
                 }
 
                 LaunchedEffect(Unit) {
+                    delay(200L)     // Reduce workload on MainThread on its first initialization.
                     // Permission check
                     requestPermissionLauncher.launch(
                         arrayOf(
@@ -216,13 +217,7 @@ class MainActivity : ComponentActivity() {
                                         enabled = true,
                                         onClick = {
                                             if (!bottomBarState.second) {
-                                                navController.navigate(NavRoutes.Home.route) {
-                                                    popUpTo(navController.graph.startDestinationId) {
-                                                        saveState = true
-                                                    }
-                                                    launchSingleTop = true
-                                                    restoreState = true
-                                                }
+                                                navController.navigate(NavRoutes.Home.route)
                                             }
                                         },
                                         icon = {
@@ -243,13 +238,7 @@ class MainActivity : ComponentActivity() {
                                         enabled = true,
                                         onClick = {
                                             if (!bottomBarState.third) {
-                                                navController.navigate(NavRoutes.Bookmark.route) {
-                                                    popUpTo(navController.graph.startDestinationId) {
-                                                        saveState = true
-                                                    }
-                                                    launchSingleTop = true
-                                                    restoreState = true
-                                                }
+                                                navController.navigate(NavRoutes.Bookmark.route)
                                             }
                                         },
                                         icon = {
@@ -276,7 +265,8 @@ class MainActivity : ComponentActivity() {
                         modifier = Modifier,
                         contentPadding = contentPadding,
                         navController = navController,
-                        viewModelFactory = viewModelFactory
+                        viewModelFactory = viewModelFactory,
+                        onExit = { activity.finish() }
                     )
 
                     LaunchedEffect(Unit) {

app/src/main/java/com/doyoonkim/knutice/MainApplication.kt

@@ -11,6 +11,7 @@ import com.doyoonkim.knutice.di.AppComponent
 import com.doyoonkim.knutice.di.DaggerAppComponent
 import com.doyoonkim.notification.fcm.PushNotificationService
 import com.doyoonkim.notification.fcm.TokenHandler
+import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 
 class MainApplication() : Application(), AppInjectorProvider {

core/data/src/main/java/com/doyoonkim/data/repository/RemoteRepositoryImpl.kt

@@ -10,7 +10,9 @@ import com.doyoonkim.network.KnuticeRemoteSource
 import com.doyoonkim.network.model.DeviceTokenRequest
 import com.doyoonkim.network.model.TopicSubscriptionPreferencesRequest
 import com.doyoonkim.network.model.UserReportRequest
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
 import model.NetworkResult
 import javax.inject.Inject
 
@@ -30,7 +32,7 @@ class RemoteRepositoryImpl @Inject constructor(
                 emit(null)
             }
         )
-    }
+    }.flowOn(Dispatchers.IO)
 
     override fun queryNoticesPerPage(category: NoticeCategory, lastNttId: Int?) = flow {
         remoteSource.getNoticesPerPage(category, lastNttId).fold(

core/domain/src/main/java/com/doyoonkim/domain/usecases/FetchAllBookmarks.kt

@@ -4,6 +4,7 @@ import com.doyoonkim.domain.LocalRepository
 import com.doyoonkim.model.BookmarkVO
 import com.doyoonkim.model.NoticeVO
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.transform
 import javax.inject.Inject
@@ -24,6 +25,8 @@ class FetchAllBookmarksImpl @Inject constructor(
                     nullable?.let { vo-> emit(Pair(bookmarkVO, vo)) }
                 })
             }
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/FetchNoticeById.kt

@@ -3,6 +3,7 @@ package com.doyoonkim.domain.usecases
 import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.NoticeVO
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.transform
 import javax.inject.Inject
 
@@ -17,5 +18,7 @@ class FetchNoticeByIdImpl @Inject constructor(
     override operator fun invoke(nttId: Int) =
         remoteRepository.queryNoticeById(nttId).transform { result ->
             result?.let { emit(it) }
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/FetchNoticeByIdFromLocal.kt

@@ -3,6 +3,7 @@ package com.doyoonkim.domain.usecases
 import com.doyoonkim.domain.LocalRepository
 import com.doyoonkim.model.NoticeVO
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.transform
 import javax.inject.Inject
 
@@ -17,6 +18,8 @@ class FetchNoticeByIdFromLocalImpl @Inject constructor(
     override operator fun invoke(nttId: Int) =
         localRepository.queryNoticeById(nttId).transform { result ->
             result?.let { emit(it) }
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/FetchNoticesByKeyword.kt

@@ -3,6 +3,7 @@ package com.doyoonkim.domain.usecases
 import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.NoticeVO
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.transform
 import javax.inject.Inject
 
@@ -17,5 +18,7 @@ class FetchNoticesByKeywordImpl @Inject constructor(
     override operator fun invoke(keyword: String) =
         remoteRepository.queryNoticesByKeyword(keyword).transform { result ->
             result?.let { emit(it) }
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/FetchNoticesPerPage.kt

@@ -4,6 +4,7 @@ import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.NoticeCategory
 import com.doyoonkim.model.NoticeVO
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.transform
 import javax.inject.Inject
 
@@ -21,5 +22,7 @@ class FetchNoticesPerPageImpl @Inject constructor(
             else queryNoticesPerPage(category, lastNttId)
         }.transform { result ->
             result?.let { emit(it) }
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/FetchTopThreeNotices.kt

@@ -3,6 +3,7 @@ package com.doyoonkim.domain.usecases
 import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.TopThreeNoticeVO
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.transform
 import javax.inject.Inject
 
@@ -17,6 +18,8 @@ class FetchTopThreeNoticesImpl @Inject constructor(
     override operator fun invoke(): Flow<TopThreeNoticeVO> =
         remoteRepository.queryTopThreeNotices().transform { result ->
             result?.let { emit(it) }
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/FetchTopicSubscriptionStatus.kt

@@ -3,6 +3,7 @@ package com.doyoonkim.domain.usecases
 import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.TopicSubscriptionPreferencesVO
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.transform
 import javax.inject.Inject
 
@@ -17,6 +18,8 @@ class FetchTopicSubscriptionStatusImpl @Inject constructor(
     override operator fun invoke() =
         remoteRepository.queryTopicSubscriptionStatus().transform { nullable ->
             nullable?.let { emit(it) }
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/ModifyBookmark.kt

@@ -5,6 +5,7 @@ import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.BookmarkVO
 import com.doyoonkim.model.NoticeVO
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.transform
 import javax.inject.Inject
@@ -26,6 +27,8 @@ class ModifyBookmarkImpl @Inject constructor(
     override fun query(nttId: Int): Flow<BookmarkVO> =
         localRepository.queryBookmarkByNttId(nttId).transform { result ->
             result?.let { emit(it) }
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 
     // TODO: Need to be revised later. (Is NoticeVO really required)
@@ -35,16 +38,23 @@ class ModifyBookmarkImpl @Inject constructor(
             remoteRepository.queryNoticeById(bookmark.targetNoticeNttId).transform { result ->
                 if (result != null) emitAll(localRepository.createBookmark(bookmark, result))
                 else emit(false)
+            }.catch {
+                /* Internal Error. Consume values, and never emit values. */
             }
         } else {
             localRepository.updateBookmark(bookmark)
+                .catch {
+                    /* Internal Error. Consume values, and never emit values. */
+                }
         }
     }
 
     override fun delete(bookmark: BookmarkVO, notice: NoticeVO): Flow<Boolean> =
         localRepository.requestBookmarkDeletion(bookmark).transform { result ->
             if (result) emitAll(localRepository.requestNoticeDeletion(notice))
             else emit(false)
+        }.catch {
+            /* Internal Error. Consume values, and never emit values. */
         }
 
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/SubmitNotificationPreferences.kt

@@ -3,6 +3,7 @@ package com.doyoonkim.domain.usecases
 import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.requestBody.TopicSubscriptionPreferencesBody
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import javax.inject.Inject
 
 interface SubmitNotificationPreferences {
@@ -15,4 +16,7 @@ class SubmitNotificationPreferencesImpl @Inject constructor(
 
     override operator fun invoke(body: TopicSubscriptionPreferencesBody) =
         remoteRepository.requestTopicSubscriptionPreferencesSubmission(body)
+            .catch {
+                /* Internal Error. Consume values, and never emit values. */
+            }
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/SubmitUserReport.kt

@@ -3,6 +3,7 @@ package com.doyoonkim.domain.usecases
 import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.requestBody.UserReportBody
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import javax.inject.Inject
 
 interface SubmitUserReport {
@@ -15,5 +16,8 @@ class SubmitUserReportImpl @Inject constructor(
 
     override operator fun invoke(body: UserReportBody) =
         remoteRepository.requestUserReportSubmission(body)
+            .catch {
+                /* Internal Error. Consume values, and never emit values. */
+            }
 
 }

core/domain/src/main/java/com/doyoonkim/domain/usecases/ValidateDeviceToken.kt

@@ -3,6 +3,7 @@ package com.doyoonkim.domain.usecases
 import com.doyoonkim.domain.RemoteRepository
 import com.doyoonkim.model.requestBody.DeviceTokenBody
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import javax.inject.Inject
 
 
@@ -16,4 +17,8 @@ class ValidateDeviceTokenImpl @Inject constructor(
 
     override operator fun invoke(requestBody: DeviceTokenBody) =
         remoteRepository.requestTokenValidation(requestBody)
+            .catch {
+                /* Internal Error. Consume values, and never emit values. */
+                emit(false)
+            }
 }