fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

catch some more exceptions during reminder creation

This commit is contained in:
tibbi 2019-12-29 18:02:39 +01:00
parent 1abfff00fb
commit 0ecf0b9feb
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
View File

@ -198,7 +198,9 @@ fun Context.notifyEvent(originalEvent: Event) {
val notification = getNotification(pendingIntent, event, content)
val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
try {
notificationManager.notify(event.id!!.toInt(), notification)
if (notification != null) {
notificationManager.notify(event.id!!.toInt(), notification)
}
} catch (e: Exception) {
showErrorToast(e)
}
@ -206,7 +208,7 @@ fun Context.notifyEvent(originalEvent: Event) {
}
@SuppressLint("NewApi")
fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content: String, publicVersion: Boolean = false): Notification {
fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content: String, publicVersion: Boolean = false): Notification? {
var soundUri = config.reminderSoundUri
if (soundUri == SILENT) {
soundUri = ""
@ -245,7 +247,12 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
lightColor = event.color
enableVibration(config.vibrateOnReminder)
setSound(Uri.parse(soundUri), audioAttributes)
notificationManager.createNotificationChannel(this)
try {
notificationManager.createNotificationChannel(this)
} catch (e: Exception) {
showErrorToast(e)
return null
}
}
}
@ -271,7 +278,10 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
}
if (!publicVersion) {
builder.setPublicVersion(getNotification(pendingIntent, event, content, true))
val notification = getNotification(pendingIntent, event, content, true)
if (notification != null) {
builder.setPublicVersion(notification)
}
}
val notification = builder.build()