Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

[FIX] iOS registerForRemoteNotifications() Now Runs on Main Thread #515

Merged
merged 6 commits into from
Oct 12, 2017
Merged

[FIX] iOS registerForRemoteNotifications() Now Runs on Main Thread #515

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46e39f4
(feat): Attempt to fix background thread error
FS-Spencer Oct 11, 2017
942e64f
(chore): Code cleanup
FS-Spencer Oct 11, 2017
42d4dfd
(docs): Added JSDoc to function added
Spenstar Oct 12, 2017
582f079
(chore): Reverted some of the styling my editor did
Spenstar Oct 12, 2017
d206f03
(chore): Missed some spacings
Spenstar Oct 12, 2017
b7d6ace
(chore): More spacing
Spenstar Oct 12, 2017
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
21 changes: 19 additions & 2 deletions firebase.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ firebase._gIDAuthentication = null;
firebase._cachedInvitation = null;
firebase._cachedDynamicLink = null;

/**
* Workaround function to call the `dispatch_get_main_queue(...)` for iOS
* thanks to Alexander Ziskind found on:
* http://nuvious.com/Blog/2016/7/5/calling-dispatch_async-in-nativescript
*/
let invokeOnRunLoop = (function () {
var runloop = CFRunLoopGetMain();
return function (func) {
CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, func);
CFRunLoopWakeUp(runloop);
}
}());

firebase._addObserver = function (eventName, callback) {
var queue = utils.ios.getter(NSOperationQueue, NSOperationQueue.mainQueue);
return utils.ios.getter(NSNotificationCenter, NSNotificationCenter.defaultCenter).addObserverForNameObjectQueueUsingBlock(eventName, null, queue, callback);
Expand Down Expand Up @@ -343,7 +356,9 @@ firebase._registerForRemoteNotifications = function () {
app = utils.ios.getter(UIApplication, UIApplication.sharedApplication);
}
if (app !== null) {
app.registerForRemoteNotifications();
invokeOnRunLoop(() => {
app.registerForRemoteNotifications();
});
}
} else {
console.log("Error requesting push notification auth: " + error);
Expand Down Expand Up @@ -388,7 +403,9 @@ firebase._registerForRemoteNotifications = function () {
} else {
var notificationTypes = UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound | UIUserNotificationActivationModeBackground;
var notificationSettings = UIUserNotificationSettings.settingsForTypesCategories(notificationTypes, null);
app.registerForRemoteNotifications(); // prompts the user to accept notifications
invokeOnRunLoop(() => {
app.registerForRemoteNotifications(); // prompts the user to accept notifications
});
app.registerUserNotificationSettings(notificationSettings);
}
};
Expand Down