Merge branch 'develop' into BOOK-434-refactor/#222

Author: easyhooon

core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/NotificationSyncUtils.kt

@@ -0,0 +1,4 @@
+package com.ninecraft.booket.core.common.utils
+
+fun shouldSyncNotification(effectiveEnabled: Boolean, lastSynced: Boolean?): Boolean =
+    lastSynced == null || lastSynced != effectiveEnabled

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultUserRepository.kt

@@ -44,20 +44,11 @@ class DefaultUserRepository(
 
     override suspend fun syncFcmToken() = runSuspendCatching {
         val newToken = getRemoteFcmToken()
-        val localToken = getLocalFcmToken()
-
-        if (newToken == localToken) {
-            Logger.d("Skip FCM token sync (already up-to-date)")
-            return@runSuspendCatching
-        }
-
         registerDevice(newToken)
-        setFcmToken(newToken)
     }
 
     override suspend fun syncFcmToken(fcmToken: String): Result<Unit> = runSuspendCatching {
         registerDevice(fcmToken)
-        setFcmToken(fcmToken)
     }
 
     override val isUserNotificationEnabled = notificationDataSource.isUserNotificationEnabled
@@ -97,12 +88,6 @@ class DefaultUserRepository(
         }
     }
 
-    private suspend fun getLocalFcmToken(): String = notificationDataSource.fcmToken.first()
-
-    private suspend fun setFcmToken(fcmToken: String) {
-        notificationDataSource.setFcmToken(fcmToken)
-    }
-
     private suspend fun getDeviceId(): String {
         return try {
             firebaseInstallations.id.await()

core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/NotificationDataSource.kt

@@ -3,9 +3,6 @@ package com.ninecraft.booket.core.datastore.api.datasource
 import kotlinx.coroutines.flow.Flow
 
 interface NotificationDataSource {
-    val fcmToken: Flow<String>
-    suspend fun setFcmToken(fcmToken: String)
-
     val isUserNotificationEnabled: Flow<Boolean>
     suspend fun setUserNotificationEnabled(isEnabled: Boolean)
 

core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultNotificationDataSource.kt

@@ -4,7 +4,6 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.stringPreferencesKey
 import com.ninecraft.booket.core.datastore.api.datasource.NotificationDataSource
 import com.ninecraft.booket.core.datastore.impl.di.NotificationDataStore
 import com.ninecraft.booket.core.datastore.impl.util.handleIOException
@@ -19,18 +18,6 @@ import kotlinx.coroutines.flow.map
 class DefaultNotificationDataSource(
     @NotificationDataStore private val dataStore: DataStore<Preferences>,
 ) : NotificationDataSource {
-    override val fcmToken: Flow<String> = dataStore.data
-        .handleIOException()
-        .map { prefs ->
-            prefs[FCM_TOKEN] ?: ""
-        }
-
-    override suspend fun setFcmToken(fcmToken: String) {
-        dataStore.edit { prefs ->
-            prefs[FCM_TOKEN] = fcmToken
-        }
-    }
-
     override val isUserNotificationEnabled: Flow<Boolean> = dataStore.data
         .handleIOException()
         .map { prefs ->
@@ -62,7 +49,6 @@ class DefaultNotificationDataSource(
     }
 
     companion object Companion {
-        private val FCM_TOKEN = stringPreferencesKey("FCM_TOKEN")
         private val USER_NOTIFICATION_ENABLED = booleanPreferencesKey("USER_NOTIFICATION_ENABLED")
         private val LAST_SYNCED_NOTIFICATION_ENABLED = booleanPreferencesKey("LAST_SYNCED_NOTIFICATION_ENABLED")
     }

feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt

@@ -7,6 +7,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import com.ninecraft.booket.core.common.analytics.AnalyticsHelper
 import com.ninecraft.booket.core.common.utils.handleException
+import com.ninecraft.booket.core.common.utils.shouldSyncNotification
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.data.api.repository.BookRepository
 import com.ninecraft.booket.core.data.api.repository.UserRepository
@@ -122,14 +123,15 @@ class HomePresenter(
                 is HomeUiEvent.OnNotificationPermissionResult -> {
                     scope.launch {
                         val isPermissionGranted = event.granted
-                        val userEnabled = userRepository.getUserNotificationEnabled()
+                        val userSettingEnabled = userRepository.getUserNotificationEnabled()
                         val lastSyncedServerEnabled = userRepository.getLastSyncedNotificationEnabled()
 
-                        val shouldSync = (!isPermissionGranted && lastSyncedServerEnabled != false) ||
-                            (userEnabled && (lastSyncedServerEnabled == null || lastSyncedServerEnabled != isPermissionGranted))
+                        val effectiveNotificationEnabled = userSettingEnabled && isPermissionGranted
+
+                        val shouldSync = shouldSyncNotification(effectiveNotificationEnabled, lastSyncedServerEnabled)
 
                         if (shouldSync) {
-                            syncNotificationSettings(isPermissionGranted)
+                            syncNotificationSettings(effectiveNotificationEnabled)
                         }
                     }
                 }

feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/notification/NotificationPresenter.kt

@@ -6,6 +6,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import com.ninecraft.booket.core.common.utils.handleException
+import com.ninecraft.booket.core.common.utils.shouldSyncNotification
 import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.feature.screens.LoginScreen
 import com.ninecraft.booket.feature.screens.NotificationScreen
@@ -100,14 +101,15 @@ class NotificationPresenter(
                 is NotificationUiEvent.OnNotificationPermissionResult -> {
                     scope.launch {
                         val isPermissionGranted = event.granted
-                        val userEnabled = userRepository.getUserNotificationEnabled()
+                        val userSettingEnabled = userRepository.getUserNotificationEnabled()
                         val lastSyncedServerEnabled = userRepository.getLastSyncedNotificationEnabled()
 
-                        val shouldSync = (!isPermissionGranted && lastSyncedServerEnabled != false) ||
-                            (userEnabled && (lastSyncedServerEnabled == null || lastSyncedServerEnabled != isPermissionGranted))
+                        val effectiveNotificationEnabled = userSettingEnabled && isPermissionGranted
+
+                        val shouldSync = shouldSyncNotification(effectiveNotificationEnabled, lastSyncedServerEnabled)
 
                         if (shouldSync) {
-                            syncNotificationSettings(isPermissionGranted)
+                            syncNotificationSettings(effectiveNotificationEnabled)
                         }
                     }
                 }

gradle/libs.versions.toml

@@ -3,8 +3,8 @@
 minSdk = "28"
 targetSdk = "35"
 compileSdk = "35"
-versionName = "1.2.0"
-versionCode = "8"
+versionName = "1.3.0"
+versionCode = "9"
 packageName = "com.ninecraft.booket"
 
 ## Android gradle plugin