Commit 5dc8b661 by Sebastián Katzer

Re-add autoCancel option on Android

parent 2efe9232
...@@ -130,7 +130,7 @@ public class Builder { ...@@ -130,7 +130,7 @@ public class Builder {
.setTicker(options.getText()) .setTicker(options.getText())
.setSmallIcon(options.getSmallIcon()) .setSmallIcon(options.getSmallIcon())
.setLargeIcon(options.getIconBitmap()) .setLargeIcon(options.getIconBitmap())
.setAutoCancel(true) .setAutoCancel(options.isAutoClear())
.setOngoing(options.isOngoing()) .setOngoing(options.isOngoing())
.setStyle(style) .setStyle(style)
.setLights(options.getLedColor(), 500, 500); .setLights(options.getLedColor(), 500, 500);
......
...@@ -175,13 +175,20 @@ public class Options { ...@@ -175,13 +175,20 @@ public class Options {
} }
/** /**
* Android only ongoing flag for local notifications. * ongoing flag for local notifications.
*/ */
public Boolean isOngoing() { public Boolean isOngoing() {
return options.optBoolean("ongoing", false); return options.optBoolean("ongoing", false);
} }
/** /**
* autoClear flag for local notifications.
*/
public Boolean isAutoClear() {
return options.optBoolean("autoClear", false);
}
/**
* Trigger date in milliseconds. * Trigger date in milliseconds.
*/ */
public long getTriggerTime() { public long getTriggerTime() {
......
...@@ -63,6 +63,7 @@ exports.applyPlatformSpecificOptions = function () { ...@@ -63,6 +63,7 @@ exports.applyPlatformSpecificOptions = function () {
defaults.icon = 'res://icon'; defaults.icon = 'res://icon';
defaults.smallIcon = 'res://ic_popup_reminder'; defaults.smallIcon = 'res://ic_popup_reminder';
defaults.ongoing = false; defaults.ongoing = false;
defaults.autoClear = true;
defaults.led = 'FFFFFF'; defaults.led = 'FFFFFF';
break; break;
} }
...@@ -86,6 +87,12 @@ exports.mergeWithDefaults = function (options) { ...@@ -86,6 +87,12 @@ exports.mergeWithDefaults = function (options) {
options.text = this.getValueFor(options, 'text', 'message'); options.text = this.getValueFor(options, 'text', 'message');
options.data = this.getValueFor(options, 'data', 'json'); options.data = this.getValueFor(options, 'data', 'json');
options.autoClear = this.getValueFor(options, 'autoClear', 'autoCancel');
if (options.autoClear !== true && options.ongoing) {
options.autoClear = false;
}
if (options.at === undefined || options.at === null) { if (options.at === undefined || options.at === null) {
options.at = new Date(); options.at = new Date();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment