Skip to content
This repository was archived by the owner on Feb 7, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name" : "nativescript-push-notifications",
"version": "0.0.17",
"version": "0.0.18",
"main" : "push-plugin.js",
"repository": {
"type": "git",
Expand All @@ -9,8 +9,8 @@
"license": "Apache-2.0",
"nativescript": {
"platforms": {
"ios": "1.0.0",
"android": "1.0.0"
"ios": "2.3.0",
"android": "2.3.0"
}
}
}
27 changes: 17 additions & 10 deletions push-plugin.ios.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = (function() {

var iosApp = require('application').ios;
var pushHandler;
var pushManager

Expand All @@ -21,8 +22,6 @@ module.exports = (function() {
this.settings = settings;
this.notificationCallbackIOS = settings.notificationCallbackIOS;

this.notificationCenter = NSNotificationCenter.defaultCenter();

// subscribe to the notification received event.
this._addObserver("notificationReceived", function(context) {
var userInfo = JSON.parse(context.userInfo.objectForKey('message'));
Expand All @@ -37,7 +36,7 @@ module.exports = (function() {
var self = this;
if (!this.didRegisterObserver) { // make sure that the events are not attached more than once
this.didRegisterObserver = this._addObserver("didRegisterForRemoteNotificationsWithDeviceToken", function(result) {
NSNotificationCenter.defaultCenter().removeObserver(self.didRegisterObserver);
self._removeObserver(self.didRegisterObserver, "didRegisterForRemoteNotificationsWithDeviceToken");
self.didRegisterObserver = undefined;
var token = result.userInfo.objectForKey('message');
success(token);
Expand All @@ -46,9 +45,8 @@ module.exports = (function() {

if (!this.didFailToRegisterObserver) {
this.didFailToRegisterObserver = this._addObserver("didFailToRegisterForRemoteNotificationsWithError", function(e) {
NSNotificationCenter.defaultCenter().removeObserver(self.didFailToRegisterObserver);
self._removeObserver(self.didFailToRegisterObserver, "didFailToRegisterForRemoteNotificationsWithError");
self.didFailToRegisterObserver = undefined;
//var err = JSON.parse(e.userInfo.objectForKey('error'));
error(e);
});
}
Expand All @@ -73,15 +71,17 @@ module.exports = (function() {

if (!this.registerUserSettingsObserver) {
this.registerUserSettingsObserver = this._addObserver("didRegisterUserNotificationSettings", function() {
NSNotificationCenter.defaultCenter().removeObserver(self.registerUserSettingsObserver);
this._removeObserver(self.registerUserSettingsObserver, "didRegisterUserNotificationSettings");

self.registerUserSettingsObserver = undefined;
success();
});
}

if (!this.failToRegisterUserSettingsObserver) {
this.failToRegisterUserSettingsObserver = this._addObserver("failToRegisterUserNotificationSettings", function(error) {
NSNotificationCenter.defaultCenter().removeObserver(self.failToRegisterUserSettingsObserver);
self._removeObserver(self.didFailToRegisterObserver, "failToRegisterUserNotificationSettings");

self.failToRegisterUserSettingsObserver = undefined;
error(error);
});
Expand All @@ -100,7 +100,8 @@ module.exports = (function() {
var self = this;
if (!this.didUnregisterObserver) {
this.didUnregisterObserver = this._addObserver("didUnregister", function(context) {
NSNotificationCenter.defaultCenter().removeObserver(self.didUnregisterObserver);
self._removeObserver(self.didUnregisterObserver, "didUnregister");

self.didUnregisterObserver = undefined;
done(context);
});
Expand All @@ -118,7 +119,9 @@ module.exports = (function() {
if(areEnabledStr === "true"){
areEnabled = true;
}
NSNotificationCenter.defaultCenter().removeObserver(self.areNotificationsEnabledObserver);

this._removeObserver(self.areNotificationsEnabledObserver, "areNotificationsEnabled");

self.areNotificationsEnabledObserver = undefined;
done(areEnabled);
});
Expand Down Expand Up @@ -155,7 +158,11 @@ module.exports = (function() {
},

_addObserver: function(eventName, callback) {
return NSNotificationCenter.defaultCenter().addObserverForNameObjectQueueUsingBlock(eventName, null, NSOperationQueue.mainQueue(), callback);
return iosApp.addNotificationObserver(eventName, callback);
},

_removeObserver: function(observer, eventName) {
iosApp.removeNotificationObserver(observer, eventName);
}

};
Expand Down