jenkins-bot has submitted this change and it was merged.
Change subject: Directly reference static field in persistence helpers without
instances
......................................................................
Directly reference static field in persistence helpers without instances
I'm unsure whether or not this will improve performance, but I think it
improves code readability since it's more clear at a glance what it is
actually happening.
Change-Id: I1285205fb00803492375740dd6a69ff088b7d65e
---
M app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
7 files changed, 9 insertions(+), 7 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/editing/summaries/EditSummaryHandler.java
b/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
index 9c4156f..28dbadd 100644
--- a/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
+++ b/app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
@@ -69,7 +69,7 @@
public void persistSummary() {
WikipediaApp app =
(WikipediaApp)container.getContext().getApplicationContext();
EditSummary summary = new
EditSummary(summaryEdit.getText().toString(), new Date());
- app.getPersister(EditSummary.class).upsert(summary,
EditSummary.PERSISTENCE_HELPER.SELECTION_KEYS);
+ app.getPersister(EditSummary.class).upsert(summary,
EditSummaryPersistenceHelper.SELECTION_KEYS);
}
public boolean handleBackPressed() {
diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index d2a30ea..8b140c3 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -149,7 +149,7 @@
if (checkedItems.valueAt(i)) {
app.getPersister(HistoryEntry.class).delete(
HistoryEntry.PERSISTENCE_HELPER.fromCursor((Cursor)
adapter.getItem(checkedItems.keyAt(i))),
-
HistoryEntry.PERSISTENCE_HELPER.SELECTION_KEYS);
+
HistoryEntryPersistenceHelper.SELECTION_KEYS);
}
}
if (checkedItems.size() ==
historyEntryList.getAdapter().getCount()) {
diff --git a/app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
b/app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
index b165125..76b65cb 100644
--- a/app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
+++ b/app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
@@ -26,7 +26,7 @@
// that all previous instances will be deleted, and then only the most
recent instance
// will be placed at the top.
final ContentPersister persister =
app.getPersister(HistoryEntry.class);
- persister.delete(entry,
HistoryEntry.PERSISTENCE_HELPER.SELECTION_KEYS);
+ persister.delete(entry, HistoryEntryPersistenceHelper.SELECTION_KEYS);
persister.persist(entry);
return null;
}
diff --git a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 86f735b..4b92f64 100644
--- a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -11,6 +11,7 @@
import org.wikipedia.page.bottomcontent.BottomContentHandler;
import org.wikipedia.page.bottomcontent.BottomContentInterface;
import org.wikipedia.page.leadimages.LeadImagesHandler;
+import org.wikipedia.pageimages.PageImagePersistenceHelper;
import org.wikipedia.server.PageLead;
import org.wikipedia.server.PageRemaining;
import org.wikipedia.server.ServiceError;
@@ -786,7 +787,7 @@
public void onFinish(Map<PageTitle, String> result) {
if (result.containsKey(model.getTitle())) {
PageImage pi = new PageImage(model.getTitle(),
result.get(model.getTitle()));
- app.getPersister(PageImage.class).upsert(pi,
PageImage.PERSISTENCE_HELPER.SELECTION_KEYS);
+ app.getPersister(PageImage.class).upsert(pi,
PageImagePersistenceHelper.SELECTION_KEYS);
updateThumbnail(result.get(model.getTitle()));
}
}
diff --git
a/app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
b/app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
index b71aebe..965f0ad 100644
--- a/app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
+++ b/app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
@@ -17,7 +17,7 @@
public Boolean performTask() throws Throwable {
savedPage.deleteFromFileSystem();
SavedPagePersister persister = (SavedPagePersister)
app.getPersister(SavedPage.class);
- persister.delete(savedPage,
SavedPage.PERSISTENCE_HELPER.SELECTION_KEYS);
+ persister.delete(savedPage, SavedPagePersistenceHelper.SELECTION_KEYS);
WikipediaApp.getInstance().getFunnelManager().getSavedPagesFunnel(savedPage.getTitle().getSite()).logDelete();
return true;
}
diff --git a/app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
b/app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
index 5d0f8b9..a5fa7c6 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
@@ -30,7 +30,7 @@
SavedPage savedPage = new SavedPage(title);
savedPage.writeToFileSystem(page);
SavedPagePersister persister = (SavedPagePersister)
app.getPersister(SavedPage.class);
- persister.upsert(savedPage,
SavedPage.PERSISTENCE_HELPER.SELECTION_KEYS);
+ persister.upsert(savedPage, SavedPagePersistenceHelper.SELECTION_KEYS);
final ImageUrlMap imageUrlMap = new
ImageUrlMap.Builder(savedPage.getBaseDir()).extractUrls(page).build();
final int numImagesAttempts = imageUrlMap.size();
diff --git a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index aa1deb0..b19e18e 100644
--- a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -1,6 +1,7 @@
package org.wikipedia.search;
import org.wikipedia.BackPressedHandler;
+import org.wikipedia.history.HistoryEntryPersistenceHelper;
import org.wikipedia.page.PageTitle;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
@@ -427,7 +428,7 @@
@Override
public Void performTask() throws Throwable {
- app.getPersister(RecentSearch.class).upsert(entry,
HistoryEntry.PERSISTENCE_HELPER.SELECTION_KEYS);
+ app.getPersister(RecentSearch.class).upsert(entry,
HistoryEntryPersistenceHelper.SELECTION_KEYS);
return null;
}
--
To view, visit https://gerrit.wikimedia.org/r/261799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1285205fb00803492375740dd6a69ff088b7d65e
Gerrit-PatchSet: 2
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
