diff options
author | Andrew Dolgov <[email protected]> | 2015-08-17 14:30:14 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-08-17 14:30:14 +0300 |
commit | c28adf42b34d810691a876e70553de9298a072cf (patch) | |
tree | bbfc410fef11c223863dc326d7c603c5bdf54218 /org.fox.ttrss/src/main | |
parent | d0a7ca271d520d855ca81b1ef1c4d731b0f9cb1b (diff) |
add another possible check for duplicate async loaded images in headlines
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index e87d2ade..86b806b6 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="369" - android:versionName="1.142" > + android:versionCode="370" + android:versionName="1.143" > <uses-sdk android:minSdkVersion="15" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index a562a33f..fc8517e7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -851,7 +851,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } @Override - public View getView(int position, View convertView, ViewGroup parent) { + public View getView(final int position, View convertView, ViewGroup parent) { View v = convertView; @@ -1164,6 +1164,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.flavorImageView.setTag("LOADING:" + posterUri); ImageAware imageAware = new ImageViewAware(holder.flavorImageView, false); + final int loadingPosition = position; m_imageLoader.displayImage(posterUri, imageAware, displayImageOptions, new ImageLoadingListener() { @Override @@ -1180,7 +1181,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, @Override public void onLoadingComplete(String imageUri, View view, Bitmap bitmap) { - if (("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { + if (loadingPosition == position && ("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { holder.flavorImageLoadingBar.setVisibility(View.GONE); holder.flavorImageView.setTag(posterUri); @@ -1274,6 +1275,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (!thumbUri.equals(holder.flavorImageView.getTag())) { holder.flavorImageView.setTag("LOADING:" + thumbUri); + final int loadingPosition = position; ImageAware imageAware = new ImageViewAware(holder.flavorImageView, false); m_imageLoader.displayImage(thumbUri, imageAware, displayImageOptions, new ImageLoadingListener() { @@ -1291,7 +1293,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, @Override public void onLoadingComplete(String imageUri, View view, Bitmap bitmap) { - if (("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { + if (loadingPosition == position && ("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { holder.flavorImageLoadingBar.setVisibility(View.GONE); holder.flavorImageView.setTag(thumbUri); holder.flavorImageView.setVisibility(View.VISIBLE); @@ -1394,6 +1396,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (!imgSrc.equals(holder.flavorImageView.getTag())) { holder.flavorImageView.setTag("LOADING:" + imgSrc); + final int loadingPosition = position; + ImageAware imageAware = new ImageViewAware(holder.flavorImageView, false); final String finalImgSrc = imgSrc; @@ -1410,7 +1414,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public void onLoadingComplete(String imageUri, View view, Bitmap bitmap) { - if (("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { + if (loadingPosition == position && ("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { holder.flavorImageLoadingBar.setVisibility(View.GONE); holder.flavorImageView.setTag(finalImgSrc); |