
(cherry picked from commit db2dd4b6c647dc01650b98472664a4e043f8f572) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
(cherry picked from commit db2dd4b6c647dc01650b98472664a4e043f8f572) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt