diff --git a/dom/push/PushServiceAndroidGCM.jsm b/dom/push/PushServiceAndroidGCM.jsm index 617806210d97..75fc832b881b 100644 --- a/dom/push/PushServiceAndroidGCM.jsm +++ b/dom/push/PushServiceAndroidGCM.jsm @@ -147,19 +147,11 @@ this.PushServiceAndroidGCM = { prefs.observe("debug", this); Services.obs.addObserver(this, "PushServiceAndroidGCM:ReceivedPushMessage", false); - return this._configure(serverURL, !!prefs.get("debug")).then(() => { - return Messaging.sendRequestForResult({ - type: "PushServiceAndroidGCM:Initialized" - }); - }); + return this._configure(serverURL, !!prefs.get("debug")); }, uninit: function() { console.debug("uninit()"); - Messaging.sendRequest({ - type: "PushServiceAndroidGCM:Uninitialized" - }); - this._mainPushService = null; Services.obs.removeObserver(this, "PushServiceAndroidGCM:ReceivedPushMessage"); prefs.ignore("debug", this); diff --git a/mobile/android/base/java/org/mozilla/gecko/push/PushService.java b/mobile/android/base/java/org/mozilla/gecko/push/PushService.java index 838a26514a31..a62c23792d3e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/push/PushService.java +++ b/mobile/android/base/java/org/mozilla/gecko/push/PushService.java @@ -26,8 +26,6 @@ import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.ThreadUtils; import java.io.IOException; -import java.util.LinkedList; -import java.util.List; import java.util.Map; /** @@ -36,10 +34,6 @@ import java.util.Map; * This singleton services Gecko messages from dom/push/PushServiceAndroidGCM.jsm and Google Cloud * Messaging requests. *
- * It is expected that Gecko is started (if not already running) soon after receiving GCM messages - * otherwise there is a greater risk that pending messages that have not been handle by Gecko will - * be lost if this service is killed. - * * It's worth noting that we allow the DOM push API in restricted profiles. */ @ReflectionTarget @@ -54,8 +48,6 @@ public class PushService implements BundleEventListener { "PushServiceAndroidGCM:Configure", "PushServiceAndroidGCM:DumpRegistration", "PushServiceAndroidGCM:DumpSubscriptions", - "PushServiceAndroidGCM:Initialized", - "PushServiceAndroidGCM:Uninitialized", "PushServiceAndroidGCM:RegisterUserAgent", "PushServiceAndroidGCM:UnregisterUserAgent", "PushServiceAndroidGCM:SubscribeChannel", @@ -82,10 +74,6 @@ public class PushService implements BundleEventListener { protected final PushManager pushManager; - private boolean canSendPushMessagesToGecko; - - private final List