Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146968
Change subject: Fix for repeated random taps eventually crashing.
......................................................................
Fix for repeated random taps eventually crashing.
Change-Id: I8f4de053fa53a66024f139ac42b7eda898df7362
---
M wikipedia/View Controllers/History/HistoryViewController.m
M wikipedia/View Controllers/Navigation/Center/CenterNavController.h
M wikipedia/View Controllers/Navigation/Center/CenterNavController.m
M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
M wikipedia/View Controllers/SearchResults/SearchResultsController.m
M wikipedia/View Controllers/WebView/WebViewController.m
8 files changed, 18 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/68/146968/1
diff --git a/wikipedia/View Controllers/History/HistoryViewController.m
b/wikipedia/View Controllers/History/HistoryViewController.m
index 18e0670..1f7bfb8 100644
--- a/wikipedia/View Controllers/History/HistoryViewController.m
+++ b/wikipedia/View Controllers/History/HistoryViewController.m
@@ -403,7 +403,8 @@
domain: historyEntry.article.domain
animated: YES
discoveryMethod: DISCOVERY_METHOD_SEARCH
- invalidatingCache: NO];
+ invalidatingCache: NO
+ popToWebVC: YES];
[self popModalToRoot];
}
diff --git a/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
b/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
index 9107402..f3ab356 100644
--- a/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
+++ b/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
@@ -19,7 +19,8 @@
domain: (NSString *)domain
animated: (BOOL)animated
discoveryMethod: (ArticleDiscoveryMethod)discoveryMethod
- invalidatingCache: (BOOL)invalidateCache;
+ invalidatingCache: (BOOL)invalidateCache
+ popToWebVC: (BOOL)popToWebVC;
-(void) promptFirstTimeZeroOnWithTitleIfAppropriate:(NSString *) title;
-(void) promptZeroOff;
diff --git a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
index f958e4e..75f55b5 100644
--- a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
+++ b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
@@ -81,6 +81,7 @@
animated: (BOOL)animated
discoveryMethod: (ArticleDiscoveryMethod)discoveryMethod
invalidatingCache: (BOOL)invalidateCache
+ popToWebVC: (BOOL)popToWebVC
{
WebViewController *webVC = [self
searchNavStackForViewControllerOfClass:[WebViewController class]];
if (webVC){
@@ -90,7 +91,9 @@
domain: domain
discoveryMethod: discoveryMethod
invalidatingCache: invalidateCache];
- [ROOT popToViewController:webVC animated:animated];
+ if (popToWebVC) {
+ [ROOT popToViewController:webVC animated:animated];
+ }
}
}
diff --git a/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m
index 36fd898..99d0cb7 100644
--- a/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
@@ -297,7 +297,8 @@
domain: [SessionSingleton sharedInstance].domain
animated: YES
discoveryMethod: DISCOVERY_METHOD_RANDOM
-
invalidatingCache: NO];
+
invalidatingCache: NO
+
popToWebVC: NO];
});
}
} cancelledBlock: ^(NSError
*errorCancel) {
diff --git a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
index 0c10f91..573673f 100644
--- a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
+++ b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
@@ -700,7 +700,8 @@
domain: languageId
animated: YES
discoveryMethod: DISCOVERY_METHOD_SEARCH
- invalidatingCache: YES];
+ invalidatingCache: YES
+ popToWebVC: YES];
}
}
diff --git a/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
b/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
index a68681d..8465c65 100644
--- a/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
+++ b/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
@@ -261,7 +261,8 @@
domain: savedEntry.article.domain
animated: YES
discoveryMethod: DISCOVERY_METHOD_SEARCH
- invalidatingCache: NO];
+ invalidatingCache: NO
+ popToWebVC: YES];
[self popModalToRoot];
}
diff --git a/wikipedia/View Controllers/SearchResults/SearchResultsController.m
b/wikipedia/View Controllers/SearchResults/SearchResultsController.m
index 805a3cf..7c83804 100644
--- a/wikipedia/View Controllers/SearchResults/SearchResultsController.m
+++ b/wikipedia/View Controllers/SearchResults/SearchResultsController.m
@@ -397,7 +397,8 @@
domain: [SessionSingleton sharedInstance].domain
animated: YES
discoveryMethod: DISCOVERY_METHOD_SEARCH
- invalidatingCache: NO];
+ invalidatingCache: NO
+ popToWebVC: YES];
}
#pragma mark Memory
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 91c7bba..e56d36e 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -1948,7 +1948,8 @@
domain: selectedLangInfo[@"code"]
animated: NO
discoveryMethod: DISCOVERY_METHOD_SEARCH
- invalidatingCache: NO];
+ invalidatingCache: NO
+ popToWebVC: YES];
[self dismissLanguagePicker];
}
--
To view, visit https://gerrit.wikimedia.org/r/146968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f4de053fa53a66024f139ac42b7eda898df7362
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
