Merge pull request #201 from Adventech/tm/fix/reminder_notification

Fix daily notification logic
Adventech · May 21, 2021 · 59d5e7d · 59d5e7d
2 parents 4277437 + 6e06940
commit 59d5e7d
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 4 deletions.
diff --git a/app/src/main/java/com/cryart/sabbathschool/reminder/DailyReminderManager.kt b/app/src/main/java/com/cryart/sabbathschool/reminder/DailyReminderManager.kt
@@ -26,10 +26,10 @@ import com.cryart.sabbathschool.core.extensions.prefs.SSPrefs
 import com.cryart.sabbathschool.settings.DailyReminder
 import com.evernote.android.job.JobManager
 import com.evernote.android.job.JobRequest
-import java.util.concurrent.TimeUnit
 import org.joda.time.DateTime
 import org.joda.time.Duration
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 
 class DailyReminderManager constructor(
     private val jobManager: JobManager,
@@ -81,6 +81,8 @@ class DailyReminderManager constructor(
 
     override fun reSchedule() {
         cancelReminder()
-        scheduleReminder()
+        if (ssPrefs.reminderEnabled()) {
+            scheduleReminder()
+        }
     }
 }
diff --git a/app/src/main/java/com/cryart/sabbathschool/ui/splash/SplashViewModel.kt b/app/src/main/java/com/cryart/sabbathschool/ui/splash/SplashViewModel.kt
@@ -26,6 +26,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.liveData
 import com.cryart.sabbathschool.core.extensions.coroutines.SchedulerProvider
+import com.cryart.sabbathschool.core.extensions.prefs.SSPrefs
 import com.cryart.sabbathschool.reminder.DailyReminderManager
 import com.google.firebase.auth.FirebaseAuth
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -34,12 +35,13 @@ import javax.inject.Inject
 @HiltViewModel
 class SplashViewModel @Inject constructor(
     private val firebaseAuth: FirebaseAuth,
+    ssPrefs: SSPrefs,
     dailyReminderManager: DailyReminderManager,
     schedulerProvider: SchedulerProvider
 ) : ViewModel() {
 
     init {
-        if (firebaseAuth.currentUser != null) {
+        if (firebaseAuth.currentUser != null && ssPrefs.reminderEnabled()) {
             dailyReminderManager.scheduleReminder()
         }
     }

diff --git a/app/src/test/java/com/cryart/sabbathschool/reminder/DailyReminderManagerTest.kt b/app/src/test/java/com/cryart/sabbathschool/reminder/DailyReminderManagerTest.kt
@@ -127,6 +127,7 @@ class DailyReminderManagerTest {
         )
         every { mockJobManager.cancelAll() }.returns(1)
         every { mockSSPrefs.getReminderJobId() }.returns(null)
+        every { mockSSPrefs.reminderEnabled() }.returns(true)
 
         testSubject.reSchedule()
 
@@ -137,6 +138,30 @@ class DailyReminderManagerTest {
         }
     }
 
+    @Test
+    fun `should cancel and not schedule when reschedule is called and reminder is disabled`() {
+        val dateTime7am = DateTime(2020, 5, 20, 7, 30)
+        testSubject = DailyReminderManager(
+            mockJobManager,
+            mockSSPrefs,
+            mockRequestBuilder,
+            dateTime7am
+        )
+        every { mockJobManager.cancelAll() }.returns(1)
+        every { mockSSPrefs.getReminderJobId() }.returns(null)
+        every { mockSSPrefs.reminderEnabled() }.returns(false)
+
+        testSubject.reSchedule()
+
+        verify {
+            mockJobManager.cancelAll()
+            mockSSPrefs.setReminderJobId(null)
+        }
+        verify(inverse = true) {
+            mockSSPrefs.setReminderJobId(1)
+        }
+    }
+
     companion object {
         private const val MINUTE = 60000L
         private const val HOUR = 60 * MINUTE

diff --git a/app/src/test/java/com/cryart/sabbathschool/ui/splash/SplashViewModelTest.kt b/app/src/test/java/com/cryart/sabbathschool/ui/splash/SplashViewModelTest.kt
@@ -23,6 +23,7 @@
 package com.cryart.sabbathschool.ui.splash
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.cryart.sabbathschool.core.extensions.prefs.SSPrefs
 import com.cryart.sabbathschool.reminder.DailyReminderManager
 import com.cryart.sabbathschool.test.coroutines.CoroutineTestRule
 import com.google.firebase.auth.FirebaseAuth
@@ -45,15 +46,18 @@ class SplashViewModelTest {
 
     private val mockFirebaseAuth: FirebaseAuth = mockk(relaxed = true)
     private val mockDailyReminderManager: DailyReminderManager = mockk()
+    private val mockSSPrefs: SSPrefs = mockk()
 
     private lateinit var viewModel: SplashViewModel
 
     @Before
     fun setUp() {
         every { mockDailyReminderManager.scheduleReminder() }.returns(Unit)
+        every { mockSSPrefs.reminderEnabled() }.returns(true)
 
         viewModel = SplashViewModel(
             mockFirebaseAuth,
+            mockSSPrefs,
             mockDailyReminderManager,
             coroutinesTestRule.dispatcherProvider
         )
@@ -83,10 +87,26 @@ class SplashViewModelTest {
 
         SplashViewModel(
             mockFirebaseAuth,
+            mockSSPrefs,
             mockDailyReminderManager,
             coroutinesTestRule.dispatcherProvider
         )
 
         verify { mockDailyReminderManager.scheduleReminder() }
     }
+
+    @Test
+    fun `should not schedule reminder when user is signed in and reminder is disabled`() {
+        every { mockFirebaseAuth.currentUser }.returns(mockk())
+        every { mockSSPrefs.reminderEnabled() }.returns(false)
+
+        SplashViewModel(
+            mockFirebaseAuth,
+            mockSSPrefs,
+            mockDailyReminderManager,
+            coroutinesTestRule.dispatcherProvider
+        )
+
+        verify(inverse = false) { mockDailyReminderManager.scheduleReminder() }
+    }
 }
diff --git a/buildSrc/src/main/kotlin/BuildAndroidConfig.kt b/buildSrc/src/main/kotlin/BuildAndroidConfig.kt
@@ -11,7 +11,7 @@ object BuildAndroidConfig {
     object Version {
         private const val MAJOR = 4
         private const val MINOR = 1
-        private const val PATCH = 2
+        private const val PATCH = 3
 
         const val name = "$MAJOR.$MINOR.$PATCH"
     }

diff --git a/common/core/src/main/java/com/cryart/sabbathschool/core/extensions/prefs/SSPrefs.kt b/common/core/src/main/java/com/cryart/sabbathschool/core/extensions/prefs/SSPrefs.kt
@@ -35,6 +35,10 @@ class SSPrefs(context: Context) {
 
     private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
+    fun reminderEnabled(): Boolean = sharedPreferences.getBoolean(
+        SSConstants.SS_SETTINGS_REMINDER_ENABLED_KEY, true
+    )
+
     fun getReminderTime(): ReminderTime {
         val timeStr = sharedPreferences.getString(
             SSConstants.SS_SETTINGS_REMINDER_TIME_KEY,