Skip to content

Added a DEFAULT property to NotificationProperties so the default values can be overridden in all cases #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CoryCharlton wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added a DEFAULT property to NotificationProperties so the default values can be overridden in all cases #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ...pluginlibrary/src/main/java/com/joaomgcd/taskerpluginlibrary/runner/TaskerPluginRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,22 @@ abstract class TaskerPluginRunner<TInput : Any, TOutput : Any> {
val notificationBuilderExtender: Notification.Builder.(context: Context) -> Notification.Builder = {this}) {
@TargetApi(Build.VERSION_CODES.O)
fun getNotification(context: Context) = Notification.Builder(context, notificationChannelId)
.setContentTitle(context.getString(titleResId))
.setContentText(context.getString(textResId))
.setContentTitle(if (titleResId != 0) context.getString(titleResId) else null)
.setContentText(if (textResId != 0) context.getString(textResId) else null)
.setSmallIcon(Icon.createWithResource(context, iconResId))
.notificationBuilderExtender(context)
.build()

companion object {
@JvmStatic
var DEFAULT: NotificationProperties = NotificationProperties()
}
}

/**
* Can be overriden so that plugins can present customized foreground notifications when they are executing on Android O or above
*/
protected open val notificationProperties get() = NotificationProperties()
protected open val notificationProperties get() = NotificationProperties.DEFAULT

@TargetApi(Build.VERSION_CODES.O)
protected fun IntentService.startForegroundIfNeeded() {
Expand All @@ -70,7 +75,7 @@ abstract class TaskerPluginRunner<TInput : Any, TOutput : Any> {
* Will start an IntentService in the foreground so that the app doesn't crash if it takes more than 5 seconds to execute
*/
@TargetApi(Build.VERSION_CODES.O)
fun startForegroundIfNeeded(intentService: Service, notificationProperties: NotificationProperties = NotificationProperties()) {
fun startForegroundIfNeeded(intentService: Service, notificationProperties: NotificationProperties = NotificationProperties.DEFAULT) {
if (!intentService.hasToRunServicesInForeground) return
intentService.createNotificationChannel(notificationProperties)
val notification: Notification = notificationProperties.getNotification(intentService)
Expand Down