ALTAPPS-890: Fix Android daily reminder (#590)

^ALTAPPS-890 Needs testing
hyperskill · Jul 18, 2023 · a3f6979 · a3f6979
1 parent f8bb121
commit a3f6979
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.../hyperskill/app/android/notification/local/DailyStudyReminderLocalNotificationDelegate.kt b/.../hyperskill/app/android/notification/local/DailyStudyReminderLocalNotificationDelegate.kt
@@ -54,20 +54,19 @@ class DailyStudyReminderLocalNotificationDelegate(
     }
 
     override fun getNextScheduledAt(): Long? =
-        getNextScheduledAtInternal()
-
-    fun scheduleDailyNotification() {
-        getNextScheduledAtInternal()?.let { scheduledAt ->
-            scheduleNotificationAt(scheduledAt)
-        }
-    }
-
-    private fun getNextScheduledAtInternal(): Long? {
         if (!notificationInteractor.isDailyStudyRemindersEnabled()) {
-            return null
+            null
+        } else {
+            getNextScheduledAtInternal(notificationInteractor.getDailyStudyRemindersIntervalStartHour())
         }
 
-        val hour = notificationInteractor.getDailyStudyRemindersIntervalStartHour()
+    fun scheduleDailyNotification(
+        selectedHour: Int = notificationInteractor.getDailyStudyRemindersIntervalStartHour()
+    ) {
+        scheduleNotificationAt(getNextScheduledAtInternal(selectedHour))
+    }
+
+    private fun getNextScheduledAtInternal(hour: Int): Long {
         val now = DateTimeHelper.nowUtc()
         val calendar = Calendar.getInstance()
         calendar.set(Calendar.HOUR_OF_DAY, hour)

diff --git a/...killApp/src/main/java/org/hyperskill/app/android/profile/view/fragment/ProfileFragment.kt b/...killApp/src/main/java/org/hyperskill/app/android/profile/view/fragment/ProfileFragment.kt
@@ -256,7 +256,7 @@ class ProfileFragment :
         profileViewModel.onNewMessage(
             ProfileFeature.Message.DailyStudyRemindersIntervalStartHourChanged(chosenInterval)
         )
-        platformNotificationComponent.dailyStudyReminderNotificationDelegate.scheduleDailyNotification()
+        platformNotificationComponent.dailyStudyReminderNotificationDelegate.scheduleDailyNotification(chosenInterval)
     }
 
     override fun onAction(action: ProfileFeature.Action.ViewAction) {