Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181603
Change subject: Additional redirect fixes
......................................................................
Additional redirect fixes
Saves redirect target into the correct directory
Change-Id: I44733da107c9a5a382bf129860bde7c6d4bdf0aa
---
M wikipedia/View Controllers/WebView/WebViewController.m
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/03/181603/1
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 5e95e9e..8437f63 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -1410,8 +1410,6 @@
if (discoveryMethod != MWK_DISCOVERY_METHOD_BACKFORWARD) {
[self updateHistoryDateVisitedForArticleBeingNavigatedFrom];
}
- self.currentTitle = title;
- session.title = title;
[self retrieveArticleForPageTitle: title
discoveryMethod: discoveryMethod];
@@ -1446,7 +1444,6 @@
{
if ([sender isKindOfClass:[ArticleFetcher class]]) {
- ArticleFetcher *articleFetcher = (ArticleFetcher *)sender;
MWKArticle *article = session.article;
switch (status) {
@@ -1454,7 +1451,7 @@
{
// Redirect if necessary.
MWKTitle *redirectedTitle = article.redirected;
- if (redirectedTitle > 0) {
+ if (redirectedTitle) {
// Get discovery method for call to
"retrieveArticleForPageTitle:".
// There should only be a single
history item (at most).
MWKHistoryEntry *history =
[session.userDataStore.historyList entryForTitle:article.title];
@@ -1463,8 +1460,8 @@
(history) ? history.discoveryMethod :
MWK_DISCOVERY_METHOD_SEARCH;
// Remove the article so it doesn't get
saved.
- //[article.managedObjectContext
deleteObject:article];
-
+ [session.userDataStore.historyList removeEntry:history];
+ [session.article remove];
// Redirect!
[self retrieveArticleForPageTitle:
redirectedTitle
@@ -1546,8 +1543,10 @@
[[QueuesSingleton sharedInstance].articleFetchManager.operationQueue
cancelAllOperations];
[[QueuesSingleton sharedInstance].searchResultsFetchManager.operationQueue
cancelAllOperations];
+ self.currentTitle = pageTitle;
+ session.title = pageTitle;
+
MWKArticle *article = session.article;
- BOOL needsRefresh = NO;
// Update the history dateVisited timestamp of the article to be visited
only
// if the article was NOT loaded via back or forward buttons.
--
To view, visit https://gerrit.wikimedia.org/r/181603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44733da107c9a5a382bf129860bde7c6d4bdf0aa
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
