jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395588 )
Change subject: Feed page cannot be updated by swiping down after changing
language at search
......................................................................
Feed page cannot be updated by swiping down after changing language at search
- Changed refresh conditions for aggregate feed to update on language change
Bug: T180529
Change-Id: Iee657a3b925a7aa2a658baf97b57d8ff67cf0296
---
M
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
index a9d7f51..dbfec05 100644
---
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
+++
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
@@ -158,14 +158,16 @@
public void request(@NonNull Context context, @NonNull WikiSite wiki,
int age, @NonNull Callback cb) {
this.cb = cb;
this.age = age;
- this.wiki = wiki;
- if (aggregatedClient.getCurrentAge() == age &&
aggregatedClient.getCurrentResponse() != null) {
+ if (aggregatedClient.getCurrentAge() == age
+ && aggregatedClient.getCurrentResponse() != null
+ && wiki.equals(this.wiki)) {
List<Card> cards = new ArrayList<>();
getCardFromResponse(aggregatedClient.getCurrentResponse(),
wiki, age, cards);
cb.success(cards);
} else {
aggregatedClient.requestAggregated(wiki, age, this);
}
+ this.wiki = wiki;
}
@Override
--
To view, visit https://gerrit.wikimedia.org/r/395588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee657a3b925a7aa2a658baf97b57d8ff67cf0296
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sharvaniharan <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[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
