BearND has submitted this change and it was merged.
Change subject: Whoops: explicitly set placeholder image for thumbnails.
......................................................................
Whoops: explicitly set placeholder image for thumbnails.
...because views can be recycled.
Change-Id: Id147dc4912d63b08eab71022865fcbf6b38f91fc
---
M wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
5 files changed, 20 insertions(+), 0 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
index 161e2c7..8167357 100644
--- a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -267,6 +267,10 @@
.placeholder(R.drawable.ic_pageimage_placeholder)
.error(R.drawable.ic_pageimage_placeholder)
.into(thumbnail);
+ } else {
+ Picasso.with(getActivity())
+ .load(R.drawable.ic_pageimage_placeholder)
+ .into(thumbnail);
}
// Check the previous item, see if the times differ enough
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 282ea4e..62142fd 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -602,6 +602,10 @@
.placeholder(R.drawable.ic_pageimage_placeholder)
.error(R.drawable.ic_pageimage_placeholder)
.into(viewHolder.thumbnail);
+ } else {
+ Picasso.with(getActivity())
+ .load(R.drawable.ic_pageimage_placeholder)
+ .into(viewHolder.thumbnail);
}
return convertView;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
index bfb8f5a..ce6707e 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
@@ -251,6 +251,10 @@
.placeholder(R.drawable.ic_pageimage_placeholder)
.error(R.drawable.ic_pageimage_placeholder)
.into(thumbnail);
+ } else {
+ Picasso.with(getActivity())
+ .load(R.drawable.ic_pageimage_placeholder)
+ .into(thumbnail);
}
// If this page title's first letter is different from the
previous title's
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
index cdf3f90..9ba88ae 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
@@ -299,6 +299,10 @@
.placeholder(R.drawable.ic_pageimage_placeholder)
.error(R.drawable.ic_pageimage_placeholder)
.into(imageView);
+ } else {
+ Picasso.with(getActivity())
+ .load(R.drawable.ic_pageimage_placeholder)
+ .into(imageView);
}
//...and lastly, if we've scrolled to the last item in the list,
then
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
index 5621063..d3660d3 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
@@ -248,6 +248,10 @@
.placeholder(R.drawable.ic_pageimage_placeholder)
.error(R.drawable.ic_pageimage_placeholder)
.into(imageView);
+ } else {
+ Picasso.with(getActivity())
+ .load(R.drawable.ic_pageimage_placeholder)
+ .into(imageView);
}
return convertView;
--
To view, visit https://gerrit.wikimedia.org/r/177405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id147dc4912d63b08eab71022865fcbf6b38f91fc
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
