Skip to content
This repository was archived by the owner on Feb 7, 2019. It is now read-only.

Fixes for IOS10. #41

Closed
ignaciolarranaga wants to merge 1 commit into from
Closed

Fixes for IOS10. #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions push-plugin.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = (function() {
this.settings = settings;
this.notificationCallbackIOS = settings.notificationCallbackIOS;

this.notificationCenter = NSNotificationCenter.defaultCenter();
this.notificationCenter = NSNotificationCenter.defaultCenter;

// subscribe to the notification received event.
this._addObserver("notificationReceived", function(context) {
Expand All @@ -37,7 +37,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);
NSNotificationCenter.defaultCenter.removeObserver(self.didRegisterObserver);
self.didRegisterObserver = undefined;
var token = result.userInfo.objectForKey('message');
success(token);
Expand All @@ -46,7 +46,7 @@ module.exports = (function() {

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

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

if (!this.failToRegisterUserSettingsObserver) {
this.failToRegisterUserSettingsObserver = this._addObserver("failToRegisterUserNotificationSettings", function(error) {
NSNotificationCenter.defaultCenter().removeObserver(self.failToRegisterUserSettingsObserver);
NSNotificationCenter.defaultCenter.removeObserver(self.failToRegisterUserSettingsObserver);
self.failToRegisterUserSettingsObserver = undefined;
error(error);
});
Expand All @@ -100,7 +100,7 @@ module.exports = (function() {
var self = this;
if (!this.didUnregisterObserver) {
this.didUnregisterObserver = this._addObserver("didUnregister", function(context) {
NSNotificationCenter.defaultCenter().removeObserver(self.didUnregisterObserver);
NSNotificationCenter.defaultCenter.removeObserver(self.didUnregisterObserver);
self.didUnregisterObserver = undefined;
done(context);
});
Expand All @@ -118,7 +118,7 @@ module.exports = (function() {
if(areEnabledStr === "true"){
areEnabled = true;
}
NSNotificationCenter.defaultCenter().removeObserver(self.areNotificationsEnabledObserver);
NSNotificationCenter.defaultCenter.removeObserver(self.areNotificationsEnabledObserver);
self.areNotificationsEnabledObserver = undefined;
done(areEnabled);
});
Expand Down Expand Up @@ -155,7 +155,7 @@ module.exports = (function() {
},

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

};
Expand Down