jenkins-bot has submitted this change and it was merged.
Change subject: Remove redundant field from LinkPreviewFunnel
......................................................................
Remove redundant field from LinkPreviewFunnel
A page title was being passed to the constructor for LinkPreviewFunnel,
which was then never actually used for anything. I assume this was used
for something in the past. Either way, it's not being used at all now.
This patch removes the field and alters all the calls to the constructor
so that it's not passed any more, to optimise performance and improve
code tidiness.
Change-Id: Ie99666ec6a9f4f0f34a1dc56f7a2e9387b72df4f
---
M app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
3 files changed, 3 insertions(+), 7 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
index e3c2b82..ee650d9 100644
--- a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
@@ -3,7 +3,6 @@
import android.support.annotation.NonNull;
import org.json.JSONObject;
-import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
public class LinkPreviewFunnel extends TimedFunnel {
@@ -12,11 +11,8 @@
private static final int PROD_LINK_PREVIEW_VERSION = 3;
private final int version;
- private final PageTitle title;
-
- public LinkPreviewFunnel(WikipediaApp app, PageTitle title) {
+ public LinkPreviewFunnel(WikipediaApp app) {
super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ?
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
- this.title = title;
version = app.isProdRelease() ? PROD_LINK_PREVIEW_VERSION :
app.getLinkPreviewVersion();
}
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index ff1779f..dcdaf62 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -403,7 +403,7 @@
if (!app.isProdRelease() && app.getLinkPreviewVersion() == 0) {
HistoryEntry historyEntry = new HistoryEntry(title,
HistoryEntry.SOURCE_INTERNAL_LINK);
getPageActivity().displayNewPage(title, historyEntry);
- new LinkPreviewFunnel(app, title).logNavigate();
+ new LinkPreviewFunnel(app).logNavigate();
} else {
getPageActivity().showLinkPreview(title,
HistoryEntry.SOURCE_INTERNAL_LINK);
}
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
index 9fab470..ae4c7f9 100755
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
@@ -136,7 +136,7 @@
// and kick off the task to load all the things...
new LinkPreviewFetchTask(app.getAPIForSite(pageTitle.getSite()),
pageTitle).execute();
- funnel = new LinkPreviewFunnel(app, pageTitle);
+ funnel = new LinkPreviewFunnel(app);
funnel.logLinkClick();
return rootView;
--
To view, visit https://gerrit.wikimedia.org/r/234713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie99666ec6a9f4f0f34a1dc56f7a2e9387b72df4f
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana <[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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
