Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CIT #62

Merged
merged 9 commits into from
May 12, 2020
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "src/Vendor/OHHTTPStubs"]
path = src/Vendor/OHHTTPStubs
url = https://github.com/AliSoftware/OHHTTPStubs.git
[submodule "src/Vendor/OCMock"]
path = src/Vendor/OCMock
url = https://github.com/erikdoe/ocmock.git
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
}
}

- (void)notificationHub:(MSNotificationHub *)notificationHub didReceivePushNotification:(MSNotificationHubMessage *)notification {
- (void)notificationHub:(MSNotificationHub *)notificationHub didReceivePushNotification:(MSNotificationHubMessage *)notification fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
NSLog(@"Received notification: %@: %@", notification.title, notification.body);
[self.notificationsTableView addNotification:notification];

Expand All @@ -79,7 +79,7 @@ - (void)notificationHub:(MSNotificationHub *)notificationHub didReceivePushNotif
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[alertController dismissViewControllerAnimated:YES completion: nil];
});
completionHandler((notification.additionalData != nil && [notification.additionalData count] > 0) ? UIBackgroundFetchResultNewData : UIBackgroundFetchResultNoData);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class SetupViewController: UIViewController, UITextFieldDelegate, UITableViewDat
}
}

func notificationHub(_ notificationHub: MSNotificationHub!, didReceivePushNotification notification: MSNotificationHubMessage!) {
func notificationHub(_ notificationHub: MSNotificationHub!, didReceivePushNotification notification: MSNotificationHubMessage!, fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
NSLog("Received notification: %@; %@", notification.title ?? "<nil>", notification.body)
notificationsTableView?.addNotification(notification);

Expand All @@ -78,6 +78,7 @@ class SetupViewController: UIViewController, UITextFieldDelegate, UITableViewDat
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
alertController.dismiss(animated: true, completion: nil)
}
completionHandler((notification.additionalData != nil && notification.additionalData.count > 0) ? .newData : .noData)
}

}
Expand Down
1 change: 1 addition & 0 deletions src/Vendor/OCMock
Submodule OCMock added at 10a754

This file was deleted.

58 changes: 0 additions & 58 deletions src/Vendor/OCMock/OCMock.framework/Headers/OCMArg.h

This file was deleted.

72 changes: 0 additions & 72 deletions src/Vendor/OCMock/OCMock.framework/Headers/OCMConstraint.h

This file was deleted.

27 changes: 0 additions & 27 deletions src/Vendor/OCMock/OCMock.framework/Headers/OCMFunctions.h

This file was deleted.

38 changes: 0 additions & 38 deletions src/Vendor/OCMock/OCMock.framework/Headers/OCMLocation.h

This file was deleted.

51 changes: 0 additions & 51 deletions src/Vendor/OCMock/OCMock.framework/Headers/OCMMacroState.h

This file was deleted.

46 changes: 0 additions & 46 deletions src/Vendor/OCMock/OCMock.framework/Headers/OCMQuantifier.h

This file was deleted.

Loading