diff options
| author | Andrew Dolgov <[email protected]> | 2015-07-18 11:28:18 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-07-18 11:33:17 +0300 |
| commit | fc459363bdb930a20e03c8e179d3f4fbf75721a6 (patch) | |
| tree | 41f70e24e326493ab1a6f5d2673915baddb000bf | |
| parent | a57fcc63d9440307f623c9dd2dcb7f34a3405c58 (diff) | |
uil: bitmap may be null
| -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 | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index d389a07e..821701a3 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="366" - android:versionName="1.139" > + android:versionCode="367" + android:versionName="1.140" > <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 c5bf5337..e179f774 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 @@ -797,6 +797,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, imgSrc = "http:" + imgSrc; if (!imgSrc.equals(holder.textImage.getTag())) { + + holder.textImage.setTag("LOADING:" + imgSrc); ImageAware imageAware = new ImageViewAware(holder.textImage, false); DisplayImageOptions options = new DisplayImageOptions.Builder() @@ -822,12 +824,14 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } @Override - public void onLoadingComplete(String s, View view, Bitmap bitmap) { - if (bitmap.getWidth() < THUMB_IMG_MIN_SIZE || bitmap.getHeight() < THUMB_IMG_MIN_SIZE) { - holder.textImage.setImageDrawable(textDrawable); - } + public void onLoadingComplete(String imageUri, View view, Bitmap bitmap) { + if (("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { + holder.textImage.setTag(finalImgSrc); - holder.textImage.setTag(finalImgSrc); + if (bitmap.getWidth() < THUMB_IMG_MIN_SIZE || bitmap.getHeight() < THUMB_IMG_MIN_SIZE) { + holder.textImage.setImageDrawable(textDrawable); + } + } } @Override @@ -1163,7 +1167,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, @Override public void onLoadingComplete(String imageUri, View view, Bitmap bitmap) { - if (("LOADING:" + imageUri).equals(view.getTag())) { + if (("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { holder.flavorImageLoadingBar.setVisibility(View.GONE); holder.flavorImageView.setTag(posterUri); @@ -1272,7 +1276,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, @Override public void onLoadingComplete(String imageUri, View view, Bitmap bitmap) { - if (("LOADING:" + imageUri).equals(view.getTag())) { + if (("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { holder.flavorImageLoadingBar.setVisibility(View.GONE); holder.flavorImageView.setTag(thumbUri); holder.flavorImageView.setVisibility(View.VISIBLE); @@ -1391,7 +1395,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public void onLoadingComplete(String imageUri, View view, Bitmap bitmap) { - if (("LOADING:" + imageUri).equals(view.getTag())) { + if (("LOADING:" + imageUri).equals(view.getTag()) && bitmap != null) { holder.flavorImageLoadingBar.setVisibility(View.GONE); holder.flavorImageView.setTag(finalImgSrc); |