From c67193d00f3c126b85e5edf1f59085029a965987 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 7 Nov 2021 09:11:41 -0500 Subject: [PATCH] Avoid crashing when notification channels can't be created/deleted For example, the application may be launched from a service, where channels cannot be deleted. (cherry picked from commit d4aeeadb26b19d0eccbf9c9adcfd459d7a3927da) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt --- app/src/main/java/eu/kanade/tachiyomi/App.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index a1cb8d8a1..1629d00b5 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -46,6 +46,7 @@ import eu.kanade.tachiyomi.network.NetworkHelper import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate import eu.kanade.tachiyomi.util.system.AuthenticatorUtil import eu.kanade.tachiyomi.util.system.animatorDurationScale +import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.notification import exh.debug.DebugToggles import exh.log.CrashlyticsPrinter @@ -180,9 +181,14 @@ open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { } protected open fun setupNotificationChannels() { - Notifications.createChannels(this) + try { + Notifications.createChannels(this) + } catch (e: Exception) { + logcat(LogPriority.ERROR, e) { "Failed to modify notification channels" } + } } + // EXH private fun setupExhLogging() { EHLogLevel.init(this)