Check that serviceWorker exists before unregistering

phonegap · Jul 25, 2016 · ef00400 · ef00400
1 parent 63a29cd
commit ef00400
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/www/browser/push.js b/www/browser/push.js
@@ -76,6 +76,7 @@ var PushNotification = function(options) {
                 throw new Error('Error subscribing for Push notifications.');
             });
         }).catch(function(error) {
+            console.log(error);
             throw new Error('Error registering Service Worker');
         });
     } else {
@@ -109,20 +110,22 @@ PushNotification.prototype.unregister = function(successCallback, errorCallback,
         };
     }
 
-    serviceWorker.unregister().then(function(isSuccess) {
-        if (isSuccess) {
-            var deviceID = subscription.endpoint.substring(subscription.endpoint.lastIndexOf('/') + 1);
-            var xmlHttp = new XMLHttpRequest();
-            var xmlURL = (that.options.browser.pushServiceURL || 'http://push.api.phonegap.com/v1/push')
-                + '/keys/' + deviceID;
-            xmlHttp.open('DELETE', xmlURL, true);
-            xmlHttp.send();
-
-            successCallback();
-        } else {
-            errorCallback();
-        }
-    });
+    if (serviceWorker) {
+        serviceWorker.unregister().then(function(isSuccess) {
+            if (isSuccess) {
+                var deviceID = subscription.endpoint.substring(subscription.endpoint.lastIndexOf('/') + 1);
+                var xmlHttp = new XMLHttpRequest();
+                var xmlURL = (that.options.browser.pushServiceURL || 'http://push.api.phonegap.com/v1/push')
+                    + '/keys/' + deviceID;
+                xmlHttp.open('DELETE', xmlURL, true);
+                xmlHttp.send();
+
+                successCallback();
+            } else {
+                errorCallback();
+            }
+        });
+    }
 };
 
 /**