[MediaWiki-commits] [Gerrit] Fix page thumbnail caching, for real. - change (apps...wikipedia)

2015-10-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Fix page thumbnail caching, for real.
..


Fix page thumbnail caching, for real.

The PageTitle object in the "model" variable wasn't being updated
correctly after the PageLead interface constructs the Page.

Bug: T115412
Change-Id: I82b8ce1e1dfaaa1eab3d1b1a26e03c63a87b85a9
---
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Mholloway: Looks good to me, approved
  Niedzielski: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java 
b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 35d9201..8d25d86 100644
--- a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -666,9 +666,9 @@
 return;
 }
 
-final PageTitle title = model.getTitle();
-Page page = pageLead.toPage(title);
+Page page = pageLead.toPage(model.getTitle());
 model.setPage(page);
+model.setTitle(page.getTitle());
 
 editHandler.setPage(model.getPage());
 
@@ -691,7 +691,7 @@
 // Update our history entry, in case the Title was changed (i.e. 
normalized)
 final HistoryEntry curEntry = model.getCurEntry();
 model.setCurEntry(
-new HistoryEntry(title, curEntry.getTimestamp(), 
curEntry.getSource()));
+new HistoryEntry(model.getTitle(), curEntry.getTimestamp(), 
curEntry.getSource()));
 
 // Save history entry and page image url
 new SaveHistoryTask(model.getCurEntry(), app).execute();

-- 
To view, visit https://gerrit.wikimedia.org/r/246684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I82b8ce1e1dfaaa1eab3d1b1a26e03c63a87b85a9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Fix page thumbnail caching, for real. - change (apps...wikipedia)

2015-10-15 Thread Dbrant (Code Review)
Dbrant has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/246684

Change subject: Fix page thumbnail caching, for real.
..

Fix page thumbnail caching, for real.

The PageTitle object in the "model" variable wasn't being updated
correctly after the PageLead interface constructs the Page.

Bug: T115412
Change-Id: I82b8ce1e1dfaaa1eab3d1b1a26e03c63a87b85a9
---
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/84/246684/1

diff --git a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java 
b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 35d9201..8d25d86 100644
--- a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -666,9 +666,9 @@
 return;
 }
 
-final PageTitle title = model.getTitle();
-Page page = pageLead.toPage(title);
+Page page = pageLead.toPage(model.getTitle());
 model.setPage(page);
+model.setTitle(page.getTitle());
 
 editHandler.setPage(model.getPage());
 
@@ -691,7 +691,7 @@
 // Update our history entry, in case the Title was changed (i.e. 
normalized)
 final HistoryEntry curEntry = model.getCurEntry();
 model.setCurEntry(
-new HistoryEntry(title, curEntry.getTimestamp(), 
curEntry.getSource()));
+new HistoryEntry(model.getTitle(), curEntry.getTimestamp(), 
curEntry.getSource()));
 
 // Save history entry and page image url
 new SaveHistoryTask(model.getCurEntry(), app).execute();

-- 
To view, visit https://gerrit.wikimedia.org/r/246684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82b8ce1e1dfaaa1eab3d1b1a26e03c63a87b85a9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits