iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix flavor images appearing in wrong modes

Browse Source
This commit is contained in:
Andrew Dolgov 2015-09-06 16:31:36 +03:00
parent 1a3f6684d5
commit 62de61c5a0
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="374" android:versionCode="375"
android:versionName="1.147" > android:versionName="1.147" >
<uses-sdk <uses-sdk

12
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -794,7 +794,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
//holder.textChecked.setVisibility(View.GONE); //holder.textChecked.setVisibility(View.GONE);
if (article.flavorImage == null) { if (!showFlavorImage || article.flavorImage == null) {
holder.textImage.setImageDrawable(textDrawable); holder.textImage.setImageDrawable(textDrawable);
holder.textImage.setTag(null); holder.textImage.setTag(null);
} else { } else {
@ -918,14 +918,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.position = position; 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 // block footer clicks to make button/selection clicking easier
if (holder.headlineFooter != null) { if (holder.headlineFooter != null) {
holder.headlineFooter.setOnClickListener(new OnClickListener() { 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())) { if (!article.flavorImageUri.equals(holder.flavorImageView.getTag())) {