From 62de61c5a0cbe3130ebce0ed81bce81928e9be8b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 6 Sep 2015 16:31:36 +0300
Subject: [PATCH] fix flavor images appearing in wrong modes

---
 org.fox.ttrss/src/main/AndroidManifest.xml           |  2 +-
 .../main/java/org/fox/ttrss/HeadlinesFragment.java   | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 8f8b98d9..f68bff2b 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="374"
+    android:versionCode="375"
     android:versionName="1.147" >
 
     <uses-sdk
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 a7099ee3..1355cd2f 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
@@ -794,7 +794,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 
 				//holder.textChecked.setVisibility(View.GONE);
 
-				if (article.flavorImage == null) {
+				if (!showFlavorImage || article.flavorImage == null) {
 					holder.textImage.setImageDrawable(textDrawable);
 					holder.textImage.setTag(null);
 				} else {
@@ -918,14 +918,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 
 			holder.position = position;
 
-			String articleContent = article.content != null ? article.content : "";
-
-			String articleContentReduced = articleContent.length() > CommonActivity.EXCERPT_MAX_QUERY_LENGTH ?
-					articleContent.substring(0, CommonActivity.EXCERPT_MAX_QUERY_LENGTH) : articleContent;
-
-			if (article.articleDoc == null)
-				article.articleDoc = Jsoup.parse(articleContentReduced);
-
 			// block footer clicks to make button/selection clicking easier
             if (holder.headlineFooter != null) {
                 holder.headlineFooter.setOnClickListener(new OnClickListener() {
@@ -1108,7 +1100,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 					}
 				});
 
-				if (article.flavorImageUri != null && holder.flavorImageView != null) {
+				if (showFlavorImage && article.flavorImageUri != null && holder.flavorImageView != null) {
 
 					if (!article.flavorImageUri.equals(holder.flavorImageView.getTag())) {