jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362279 )
Change subject: Hygiene: remove redundant method.
......................................................................
Hygiene: remove redundant method.
Change-Id: Iad051dc8b2bfd8c38e65d5569c5c003ae77916a0
---
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListData.java
M
app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
3 files changed, 2 insertions(+), 17 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index 3c7ed6e..a0147b3 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -23,7 +23,6 @@
import org.wikipedia.page.PageTitle;
import org.wikipedia.readinglist.page.ReadingListPage;
import org.wikipedia.readinglist.page.database.ReadingListDaoProxy;
-import org.wikipedia.readinglist.page.database.ReadingListPageDao;
import org.wikipedia.readinglist.sync.ReadingListSynchronizer;
import org.wikipedia.settings.Prefs;
import org.wikipedia.util.DimenUtil;
@@ -279,7 +278,7 @@
}
@NonNull private ReadingListPage findOrCreatePage(ReadingList readingList,
PageTitle title) {
- ReadingListPage page =
ReadingListPageDao.instance().findPage(ReadingListDaoProxy.key(title));
+ ReadingListPage page =
ReadingListData.instance().findPageInAnyList(ReadingListDaoProxy.key(title));
if (page == null) {
page = ReadingListDaoProxy.page(readingList, title);
}
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListData.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListData.java
index b1999e7..8793fe6 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListData.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListData.java
@@ -207,7 +207,7 @@
@Nullable
- private synchronized ReadingListPage findPageInAnyList(String key) {
+ public synchronized ReadingListPage findPageInAnyList(String key) {
Cursor cursor = ReadingListPageDao.instance().page(key);
try {
if (cursor.getCount() != 0) {
diff --git
a/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
b/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
index 0ae8777..bdb67da 100644
---
a/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
+++
b/app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageDao.java
@@ -3,7 +3,6 @@
import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import org.wikipedia.WikipediaApp;
@@ -77,19 +76,6 @@
return title;
}
}, callback);
- }
-
- @Nullable public ReadingListPage findPage(@NonNull String key) {
- Cursor cursor = ReadingListPageDao.instance().page(key);
- try {
- if (cursor.getCount() > 0) {
- cursor.moveToFirst();
- return ReadingListPage.fromCursor(cursor);
- }
- } finally {
- cursor.close();
- }
- return null;
}
public void deletePageFromLists(@NonNull ReadingListPage page,
--
To view, visit https://gerrit.wikimedia.org/r/362279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad051dc8b2bfd8c38e65d5569c5c003ae77916a0
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
