Commit 55a367e8 by Sebastián Katzer

Do not queue trigger or clear events

parent 69e49661
...@@ -26,6 +26,8 @@ import android.os.Bundle; ...@@ -26,6 +26,8 @@ import android.os.Bundle;
import de.appplant.cordova.plugin.notification.Notification; import de.appplant.cordova.plugin.notification.Notification;
import de.appplant.cordova.plugin.notification.receiver.AbstractClearReceiver; import de.appplant.cordova.plugin.notification.receiver.AbstractClearReceiver;
import static de.appplant.cordova.plugin.localnotification.LocalNotification.fireEvent;
import static de.appplant.cordova.plugin.localnotification.LocalNotification.isAppRunning;
import static de.appplant.cordova.plugin.notification.Request.EXTRA_LAST; import static de.appplant.cordova.plugin.notification.Request.EXTRA_LAST;
/** /**
...@@ -51,7 +53,9 @@ public class ClearReceiver extends AbstractClearReceiver { ...@@ -51,7 +53,9 @@ public class ClearReceiver extends AbstractClearReceiver {
notification.clear(); notification.clear();
} }
LocalNotification.fireEvent("clear", notification); if (isAppRunning()) {
fireEvent("clear", notification);
}
} }
} }
...@@ -30,6 +30,7 @@ import org.json.JSONObject; ...@@ -30,6 +30,7 @@ import org.json.JSONObject;
import de.appplant.cordova.plugin.notification.Notification; import de.appplant.cordova.plugin.notification.Notification;
import de.appplant.cordova.plugin.notification.receiver.AbstractClickReceiver; import de.appplant.cordova.plugin.notification.receiver.AbstractClickReceiver;
import static de.appplant.cordova.plugin.localnotification.LocalNotification.fireEvent;
import static de.appplant.cordova.plugin.notification.Options.EXTRA_LAUNCH; import static de.appplant.cordova.plugin.notification.Options.EXTRA_LAUNCH;
import static de.appplant.cordova.plugin.notification.Request.EXTRA_LAST; import static de.appplant.cordova.plugin.notification.Request.EXTRA_LAST;
...@@ -54,7 +55,7 @@ public class ClickReceiver extends AbstractClickReceiver { ...@@ -54,7 +55,7 @@ public class ClickReceiver extends AbstractClickReceiver {
setTextInput(action, data); setTextInput(action, data);
launchAppIf(); launchAppIf();
LocalNotification.fireEvent(action, notification, data); fireEvent(action, notification, data);
if (notification.getOptions().isSticky()) if (notification.getOptions().isSticky())
return; return;
......
...@@ -583,6 +583,13 @@ public class LocalNotification extends CordovaPlugin { ...@@ -583,6 +583,13 @@ public class LocalNotification extends CordovaPlugin {
} }
/** /**
* If the app is running.
*/
static boolean isAppRunning() {
return webView != null;
}
/**
* Convert JSON array of integers to List. * Convert JSON array of integers to List.
* *
* @param ary Array of integers. * @param ary Array of integers.
......
...@@ -37,6 +37,8 @@ import de.appplant.cordova.plugin.notification.receiver.AbstractTriggerReceiver; ...@@ -37,6 +37,8 @@ import de.appplant.cordova.plugin.notification.receiver.AbstractTriggerReceiver;
import static android.content.Context.POWER_SERVICE; import static android.content.Context.POWER_SERVICE;
import static android.os.Build.VERSION.SDK_INT; import static android.os.Build.VERSION.SDK_INT;
import static android.os.Build.VERSION_CODES.LOLLIPOP; import static android.os.Build.VERSION_CODES.LOLLIPOP;
import static de.appplant.cordova.plugin.localnotification.LocalNotification.fireEvent;
import static de.appplant.cordova.plugin.localnotification.LocalNotification.isAppRunning;
import static java.util.Calendar.MINUTE; import static java.util.Calendar.MINUTE;
/** /**
...@@ -72,8 +74,8 @@ public class TriggerReceiver extends AbstractTriggerReceiver { ...@@ -72,8 +74,8 @@ public class TriggerReceiver extends AbstractTriggerReceiver {
notification.show(); notification.show();
if (!isUpdate) { if (!isUpdate && isAppRunning()) {
LocalNotification.fireEvent("trigger", notification); fireEvent("trigger", notification);
} }
if (!options.isInfiniteTrigger()) if (!options.isInfiniteTrigger())
......
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