diff --git a/app/src/main/java/io/timelimit/android/logic/BlockingReason.kt b/app/src/main/java/io/timelimit/android/logic/BlockingReason.kt index 1368a03..22f5832 100644 --- a/app/src/main/java/io/timelimit/android/logic/BlockingReason.kt +++ b/app/src/main/java/io/timelimit/android/logic/BlockingReason.kt @@ -152,8 +152,22 @@ class BlockingReasonUtil(private val appLogic: AppLogic) { Log.d(LOG_TAG, "step 4.5") } - if (forNotification && category.blockAllNotifications) { - return liveDataFromValue(BlockingReason.NotificationsAreBlocked) + fun default() = getBlockingReasonStep4Point7(category, child, timeZone, isParentCategory, forNotification) + + return if (forNotification && category.blockAllNotifications) { + appLogic.fullVersion.shouldProvideFullVersionFunctions.switchMap { fullVersion -> + if (fullVersion) { + liveDataFromValue(BlockingReason.NotificationsAreBlocked) + } else { + default() + } + } + } else default() + } + + private fun getBlockingReasonStep4Point7(category: Category, child: User, timeZone: TimeZone, isParentCategory: Boolean, forNotification: Boolean): LiveData { + if (BuildConfig.DEBUG) { + Log.d(LOG_TAG, "step 4.7") } if (category.temporarilyBlocked) {