Commit 38503d9c by Sebastián Katzer

Fix playing sound again when calling update method

parent 169e3cfa
...@@ -39,6 +39,7 @@ import de.appplant.cordova.plugin.notification.action.Action; ...@@ -39,6 +39,7 @@ import de.appplant.cordova.plugin.notification.action.Action;
import static android.app.PendingIntent.FLAG_CANCEL_CURRENT; import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
import static de.appplant.cordova.plugin.notification.Notification.EXTRA_UPDATE;
/** /**
* Builder class for local notifications. Build fully configured local * Builder class for local notifications. Build fully configured local
...@@ -134,7 +135,6 @@ public final class Builder { ...@@ -134,7 +135,6 @@ public final class Builder {
.setAutoCancel(options.isAutoClear()) .setAutoCancel(options.isAutoClear())
.setOngoing(options.isSticky()) .setOngoing(options.isSticky())
.setColor(options.getColor()) .setColor(options.getColor())
.setSound(sound)
.setVisibility(options.getVisibility()) .setVisibility(options.getVisibility())
.setPriority(options.getPriority()) .setPriority(options.getPriority())
.setShowWhen(options.getShowWhen()) .setShowWhen(options.getShowWhen())
...@@ -143,6 +143,10 @@ public final class Builder { ...@@ -143,6 +143,10 @@ public final class Builder {
.setGroupSummary(options.getGroupSummary()) .setGroupSummary(options.getGroupSummary())
.setLights(options.getLedColor(), options.getLedOn(), options.getLedOff()); .setLights(options.getLedColor(), options.getLedOn(), options.getLedOff());
if (sound != Uri.EMPTY && !isUpdate()) {
builder.setSound(sound);
}
if (options.isWithProgressBar()) { if (options.isWithProgressBar()) {
builder.setProgress( builder.setProgress(
options.getProgressMaxValue(), options.getProgressMaxValue(),
...@@ -393,4 +397,13 @@ public final class Builder { ...@@ -393,4 +397,13 @@ public final class Builder {
context, reqCode, intent, FLAG_CANCEL_CURRENT); context, reqCode, intent, FLAG_CANCEL_CURRENT);
} }
/**
* If the builder shall build an notification or an updated version.
*
* @return true in case of an updated version.
*/
private boolean isUpdate() {
return extras != null && extras.getBoolean(EXTRA_UPDATE, false);
}
} }
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