Skip to content

Fixed presentation of PFAlertView when rootViewController has presentedViewController. #80

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 21, 2015
Merged

Fixed presentation of PFAlertView when rootViewController has presentedViewController. #80

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions Parse/Internal/PFAlertView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ + (void)showAlertWithTitle:(NSString *)title

UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
UIViewController *viewController = keyWindow.rootViewController;
while (viewController.presentedViewController) {
viewController = viewController.presentedViewController;
}

[viewController presentViewController:alertController animated:YES completion:nil];
} else {
Expand Down
1 change: 1 addition & 0 deletions Tests/Unit/AlertViewTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ - (void)testShowAlertWithAlertViewController {
id mockedApplication = PFStrictClassMock([UIApplication class]);
UIWindow *mockedWindow = PFStrictClassMock([UIWindow class]);
UIViewController *mockedViewController = PFStrictClassMock([UIViewController class]);
OCMStub(mockedViewController.presentedViewController).andReturn(nil);

// Using .andReturn() here will result in a retain cycle, which will cause our mocked shared application to
// persist across tests.
Expand Down