Merge pull request #45 from omer358/dev

fix #44
omer358 · Aug 14, 2024 · 718287b · 718287b
2 parents 4442a6f + 11c8909
commit 718287b
Showing 1 changed file with 26 additions and 20 deletions.
diff --git a/app/src/main/java/com/example/rememberme/MainActivity.kt b/app/src/main/java/com/example/rememberme/MainActivity.kt
@@ -27,24 +27,26 @@ import java.util.concurrent.TimeUnit
 class MainActivity : ComponentActivity() {
 
     private val settingsViewModel: SettingsViewModel by viewModels()
-
+    private var lastRepetition: RemindersRepetition? = null
 
     private val requestPermissionLauncher = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
     ) { isGranted: Boolean ->
         lifecycleScope.launch {
             settingsViewModel.uiState.collect { uiState ->
-                if (isGranted) {
+                if (isGranted && uiState.remindersRepetition != lastRepetition) {
                     // Permission is granted. Schedule the notification work with the correct repetition.
                     Log.i(TAG, "Permission granted")
                     scheduleNotificationWork(uiState.remindersRepetition)
+                    lastRepetition = uiState.remindersRepetition
                 } else {
                     Log.i(TAG, "Permission denied")
                     // Permission is denied. Handle the case.
                 }
             }
         }
     }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -56,24 +58,28 @@ class MainActivity : ComponentActivity() {
 
         lifecycleScope.launch {
             settingsViewModel.uiState.collect { uiState ->
+                Log.i(TAG, "Settings UI state: $uiState")
                 val remindersRepetition = uiState.remindersRepetition
 
-                // Check for notification permission only if the SDK version is 33 or higher
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    if (ContextCompat.checkSelfPermission(
-                            this@MainActivity,
-                            POST_NOTIFICATIONS
-                        ) == PackageManager.PERMISSION_GRANTED
-                    ) {
-                        // Permission is already granted
-                        scheduleNotificationWork(remindersRepetition)
+                if (remindersRepetition != lastRepetition) {
+                    // Check for notification permission only if the SDK version is 33 or higher
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        if (ContextCompat.checkSelfPermission(
+                                this@MainActivity,
+                                POST_NOTIFICATIONS
+                            ) == PackageManager.PERMISSION_GRANTED
+                        ) {
+                            // Permission is already granted
+                            scheduleNotificationWork(remindersRepetition)
+                        } else {
+                            // Request permission
+                            requestPermissionLauncher.launch(POST_NOTIFICATIONS)
+                        }
                     } else {
-                        // Request permission
-                        requestPermissionLauncher.launch(POST_NOTIFICATIONS)
+                        // SDK version is lower than 33, no need to request POST_NOTIFICATIONS permission
+                        scheduleNotificationWork(remindersRepetition)
                     }
-                } else {
-                    // SDK version is lower than 33, no need to request POST_NOTIFICATIONS permission
-                    scheduleNotificationWork(remindersRepetition)
+                    lastRepetition = remindersRepetition
                 }
             }
         }
@@ -83,7 +89,7 @@ class MainActivity : ComponentActivity() {
         Log.i(TAG, "Scheduling notification work with repetition: $repetition")
         val repeatInterval = when (repetition) {
             RemindersRepetition.OnceADay -> 24
-            RemindersRepetition.ThreeADay -> 24 /3
+            RemindersRepetition.ThreeADay -> 24 / 3
             RemindersRepetition.FiveADay -> 24 / 5
         }
 
@@ -92,17 +98,17 @@ class MainActivity : ComponentActivity() {
             repeatInterval.toLong(),
             TimeUnit.HOURS)
             .addTag("notificationWorkRequest")
+            .setInitialDelay(repeatInterval.toLong(), TimeUnit.HOURS)
             .build()
 
         WorkManager.getInstance(this).enqueueUniquePeriodicWork(
             "notificationWork",
-            ExistingPeriodicWorkPolicy.KEEP, // Keeps the existing work if it exists
+            ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE,
             notificationWorkRequest
         )
     }
 
     companion object {
         private const val TAG = "MainActivity"
     }
-
-}
+}