Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383482 )
Change subject: Bug: T177657 Change-Id:
If99f35977700261d4da84d1a05d585d8c57c8c04
......................................................................
Bug: T177657
Change-Id: If99f35977700261d4da84d1a05d585d8c57c8c04
---
M app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
1 file changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/82/383482/1
diff --git
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
index 4cdd80d..f13e477 100644
---
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
+++
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
@@ -7,6 +7,7 @@
import org.wikipedia.dataclient.WikiSite;
import org.wikipedia.dataclient.mwapi.MwQueryResponse;
import org.wikipedia.feed.dataclient.FeedClient;
+import org.wikipedia.feed.model.Card;
import org.wikipedia.history.HistoryEntry;
import org.wikipedia.page.bottomcontent.MainPageReadMoreTopicTask;
import org.wikipedia.search.FullTextSearchClient;
@@ -36,7 +37,7 @@
cb.error(new IOException("Error retrieving history entry
for suggestions"));
return;
}
- getCardForHistoryEntry(wiki, entry, cb);
+ getCardForHistoryEntry(entry, cb);
}
@Override public void onCatch(Throwable caught) {
@@ -58,13 +59,17 @@
}
}
- private void getCardForHistoryEntry(@NonNull WikiSite wiki, @NonNull final
HistoryEntry entry,
+ private void getCardForHistoryEntry(@NonNull final HistoryEntry entry,
final FeedClient.Callback cb) {
- requestMoreLike(wiki, entry.getTitle().getDisplayText(), null, null,
SUGGESTION_REQUEST_ITEMS,
- new FullTextSearchClient.Callback() {
+ requestMoreLike(entry.getTitle().getWikiSite(),
entry.getTitle().getDisplayText(),
+ null, null, SUGGESTION_REQUEST_ITEMS, new
FullTextSearchClient.Callback() {
@Override public void success(@NonNull Call<MwQueryResponse> call,
@NonNull SearchResults results) {
-
cb.success(Collections.singletonList(toBecauseYouReadCard(results, entry)));
+ SearchResults filteredResults = SearchResults
+ .filter(results, entry.getTitle().getText(), false);
+ cb.success(filteredResults.getResults().isEmpty()
+ ? Collections.<Card>emptyList()
+ :
Collections.singletonList(toBecauseYouReadCard(results, entry)));
}
@Override public void failure(@NonNull Call<MwQueryResponse> call,
@@ -77,9 +82,7 @@
@NonNull private BecauseYouReadCard toBecauseYouReadCard(@NonNull
SearchResults results,
@NonNull
HistoryEntry entry) {
List<BecauseYouReadItemCard> itemCards = new ArrayList<>();
- for (SearchResult result : SearchResults
- .filter(results, entry.getTitle().getText(), false)
- .getResults()) {
+ for (SearchResult result : results.getResults()) {
itemCards.add(new BecauseYouReadItemCard(result.getPageTitle()));
}
return new BecauseYouReadCard(entry, itemCards);
--
To view, visit https://gerrit.wikimedia.org/r/383482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If99f35977700261d4da84d1a05d585d8c57c8c04
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
