public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1455 (crash opening notifications)

Browse source
This commit is contained in:
David Sinclair 2021-06-04 21:49:08 -07:00
parent 8760fef8cd
commit cad8017b5c
4 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/ios/Classes/FeedDetailObjCViewController.m
View file

@ -2512,7 +2512,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
// popToViewController:[self.appDelegate.feedsNavigationController.viewControllers // popToViewController:[self.appDelegate.feedsNavigationController.viewControllers
// objectAtIndex:0] // objectAtIndex:0]
// animated:YES]; // animated:YES];
[self.splitViewController showColumn:UISplitViewControllerColumnPrimary]; [self.appDelegate showColumn:UISplitViewControllerColumnPrimary debugInfo:@"deleteSite"];
[MBProgressHUD hideHUDForView:self.view animated:YES]; [MBProgressHUD hideHUDForView:self.view animated:YES];
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
[self requestFailed:error]; [self requestFailed:error];
@ -2539,7 +2539,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
// popToViewController:[self.appDelegate.feedsNavigationController.viewControllers // popToViewController:[self.appDelegate.feedsNavigationController.viewControllers
// objectAtIndex:0] // objectAtIndex:0]
// animated:YES]; // animated:YES];
[self.splitViewController showColumn:UISplitViewControllerColumnPrimary]; [self.appDelegate showColumn:UISplitViewControllerColumnPrimary debugInfo:@"deleteFolder"];
[MBProgressHUD hideHUDForView:self.view animated:YES]; [MBProgressHUD hideHUDForView:self.view animated:YES];
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
[self requestFailed:error]; [self requestFailed:error];
@ -2567,7 +2567,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
[self.appDelegate reloadFeedsView:YES]; [self.appDelegate reloadFeedsView:YES];
// [self.appDelegate.feedsNavigationController popToViewController:[self.appDelegate.feedsNavigationController.viewControllers objectAtIndex:0] // [self.appDelegate.feedsNavigationController popToViewController:[self.appDelegate.feedsNavigationController.viewControllers objectAtIndex:0]
// animated:YES]; // animated:YES];
[self.splitViewController showColumn:UISplitViewControllerColumnPrimary]; [self.appDelegate showColumn:UISplitViewControllerColumnPrimary debugInfo:@"muteSite"];
[MBProgressHUD hideHUDForView:self.view animated:YES]; [MBProgressHUD hideHUDForView:self.view animated:YES];
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
[self requestFailed:error]; [self requestFailed:error];

1
clients/ios/Classes/NewsBlurAppDelegate.h
View file

@ -321,6 +321,7 @@ SFSafariViewControllerDelegate> {
- (void)resizePreviewSize; - (void)resizePreviewSize;
- (void)resizeFontSize; - (void)resizeFontSize;
- (void)popToRootWithCompletion:(void (^)(void))completion; - (void)popToRootWithCompletion:(void (^)(void))completion;
- (void)showColumn:(UISplitViewControllerColumn)column debugInfo:(NSString *)debugInfo;
- (void)showMoveSite; - (void)showMoveSite;
- (void)openTrainSite; - (void)openTrainSite;

16
clients/ios/Classes/NewsBlurAppDelegate.m
View file

@ -777,13 +777,21 @@
} }
[self.splitViewController dismissViewControllerAnimated:NO completion:nil]; [self.splitViewController dismissViewControllerAnimated:NO completion:nil];
[self.splitViewController showColumn:UISplitViewControllerColumnPrimary]; [self showColumn:UISplitViewControllerColumnPrimary debugInfo:@"popToRootWithCompletion"];
if (completion) { if (completion) {
[CATransaction commit]; [CATransaction commit];
} }
} }
- (void)showColumn:(UISplitViewControllerColumn)column debugInfo:(NSString *)debugInfo {
NSLog(@"⚠️ show column for %@: split view controller: %@ split nav: %@; split controllers: %@; detail controller: %@; detail nav: %@; detail nav controllers: %@", debugInfo, self.splitViewController, self.splitViewController.navigationController, self.splitViewController.viewControllers, self.detailViewController, self.detailViewController.navigationController, self.detailViewController.navigationController.viewControllers); // log
[self.splitViewController showColumn:column];
NSLog(@"...shown"); // log
}
- (void)showPremiumDialog { - (void)showPremiumDialog {
if (self.premiumNavigationController == nil) { if (self.premiumNavigationController == nil) {
self.premiumNavigationController = [[UINavigationController alloc] self.premiumNavigationController = [[UINavigationController alloc]
@ -1580,7 +1588,7 @@
[self.feedDetailViewController.storyTitlesTable reloadData]; [self.feedDetailViewController.storyTitlesTable reloadData];
if (detailViewController.storyTitlesOnLeft && [[UIDevice currentDevice] userInterfaceIdiom] != UIUserInterfaceIdiomPhone) { if (detailViewController.storyTitlesOnLeft && [[UIDevice currentDevice] userInterfaceIdiom] != UIUserInterfaceIdiomPhone) {
[self.splitViewController showColumn:UISplitViewControllerColumnSupplementary]; [self showColumn:UISplitViewControllerColumnSupplementary debugInfo:@"loadFeedDetailView"];
} }
if (feedDetailViewController.view.window == nil) { if (feedDetailViewController.view.window == nil) {
@ -1943,7 +1951,7 @@
} }
[navController showViewController:feedDetailViewController sender:self]; [navController showViewController:feedDetailViewController sender:self];
[self.splitViewController showColumn:UISplitViewControllerColumnSupplementary]; [self showColumn:UISplitViewControllerColumnSupplementary debugInfo:@"loadRiverFeedDetailView"];
} }
[self flushQueuedReadStories:NO withCallback:^{ [self flushQueuedReadStories:NO withCallback:^{
@ -2304,7 +2312,7 @@
if (self.splitViewController.isCollapsed) { if (self.splitViewController.isCollapsed) {
[self.feedsNavigationController popToRootViewControllerAnimated:YES]; [self.feedsNavigationController popToRootViewControllerAnimated:YES];
} else { } else {
[self.splitViewController showColumn:UISplitViewControllerColumnPrimary]; [self showColumn:UISplitViewControllerColumnPrimary debugInfo:@"showFeedsListAnimated"];
} }
} }

10
clients/ios/Classes/StoryPagesObjCViewController.m
View file

@ -968,7 +968,7 @@
[pageController clearStory]; [pageController clearStory];
//TODO: might want to check if overlay display, or something, to avoid doing this on compact layout //TODO: might want to check if overlay display, or something, to avoid doing this on compact layout
[self.splitViewController showColumn:UISplitViewControllerColumnSupplementary]; [self.appDelegate showColumn:UISplitViewControllerColumnSupplementary debugInfo:@"applyNewIndex"];
} }
if (!suppressRedraw) { if (!suppressRedraw) {
@ -1177,11 +1177,7 @@
} }
if (self.isPhoneOrCompact || animated) { if (self.isPhoneOrCompact || animated) {
NSLog(@"⚠️ showing story pages: split view controller: %@ split nav: %@; split controllers: %@; detail controller: %@; detail nav: %@; detail nav controllers: %@", appDelegate.splitViewController, appDelegate.splitViewController.navigationController, appDelegate.splitViewController.viewControllers, appDelegate.detailViewController, appDelegate.detailViewController.navigationController, appDelegate.detailViewController.navigationController.viewControllers); // log [appDelegate showColumn:UISplitViewControllerColumnSecondary debugInfo:@"changePage"];
[appDelegate.splitViewController showColumn:UISplitViewControllerColumnSecondary];
NSLog(@"...shown"); // log
} }
[self becomeFirstResponder]; [self becomeFirstResponder];
@ -1848,7 +1844,7 @@
// popToViewController:[appDelegate.feedsNavigationController.viewControllers // popToViewController:[appDelegate.feedsNavigationController.viewControllers
// objectAtIndex:0] // objectAtIndex:0]
// animated:YES]; // animated:YES];
[self.splitViewController showColumn:UISplitViewControllerColumnSupplementary]; [self.appDelegate showColumn:UISplitViewControllerColumnSupplementary debugInfo:@"doPreviousStory"];
[appDelegate hideStoryDetailView]; [appDelegate hideStoryDetailView];
} else { } else {
NSInteger previousLocation = [appDelegate.storiesCollection locationOfStoryId:previousStoryId]; NSInteger previousLocation = [appDelegate.storiesCollection locationOfStoryId:previousStoryId];