jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Extract calculating lead image width
......................................................................
Hygiene: Extract calculating lead image width
And make metadata (mobileview) JSON object key more generic
in preparation of a simpler switch between mobileview and mobile content
service.
Bug: T104714
Change-Id: I5d71dee14f1e5fa4e15b3a1c1c03c3319523d33a
---
M wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
1 file changed, 11 insertions(+), 8 deletions(-)
Approvals:
Sniedzielski: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
b/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 7cda167..6daaa82 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -616,6 +616,7 @@
private class LeadSectionFetchTask extends SectionsFetchTask {
private final int startSequenceNum;
private PageProperties pageProperties;
+ private String pagePropsResponseName = "mobileview";
public LeadSectionFetchTask(int startSequenceNum) {
super(app, model.getTitle(), "0");
@@ -628,10 +629,7 @@
builder.param("prop", builder.getParams().get("prop")
+ "|thumb|image|id|revision|description|"
+ Page.API_REQUEST_PROPS);
- Resources res = app.getResources();
- builder.param("thumbsize",
- Integer.toString((int)
(res.getDimension(R.dimen.leadImageWidth)
- / res.getDisplayMetrics().density)));
+ builder.param("thumbsize",
Integer.toString(calculateLeadImageWidth()));
return builder;
}
@@ -640,10 +638,10 @@
if (startSequenceNum != currentSequenceNum) {
return super.processResult(result);
}
- JSONObject mobileView =
result.asObject().optJSONObject("mobileview");
- if (mobileView != null) {
- pageProperties = new PageProperties(mobileView);
-
model.setTitle(fragment.adjustPageTitleFromMobileview(model.getTitle(),
mobileView));
+ JSONObject metadata =
result.asObject().optJSONObject(pagePropsResponseName);
+ if (metadata != null) {
+ pageProperties = new PageProperties(metadata);
+
model.setTitle(fragment.adjustPageTitleFromMobileview(model.getTitle(),
metadata));
}
return super.processResult(result);
}
@@ -705,6 +703,11 @@
}
}
+ private int calculateLeadImageWidth() {
+ Resources res = app.getResources();
+ return (int) (res.getDimension(R.dimen.leadImageWidth) /
res.getDisplayMetrics().density);
+ }
+
private class RestSectionsFetchTask extends SectionsFetchTask {
private final int startSequenceNum;
--
To view, visit https://gerrit.wikimedia.org/r/226674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d71dee14f1e5fa4e15b3a1c1c03c3319523d33a
Gerrit-PatchSet: 12
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
