From 84a766213d35386dd8b805451219ba9a3ec2622e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 17 Sep 2012 23:33:36 +0400
Subject: [PATCH] feed_title substring crash fix

---
 src/org/fox/ttrss/HeadlinesFragment.java                | 7 ++++++-
 src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 00a7160c..033c1bec 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -576,7 +576,12 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			
 			if (ft != null) {
 				if (article.feed_title != null && (m_feed.is_cat || m_feed.id < 0)) {
-					ft.setText(article.feed_title.substring(0, 30));					
+					
+					if (article.feed_title.length() > 20)
+						ft.setText(article.feed_title.substring(0, 20) + "...");
+					else
+						ft.setText(article.feed_title);
+					
 				} else {
 					ft.setVisibility(View.GONE);
 				}
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 36acbe11..769a3795 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -462,7 +462,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			int feedTitleIndex = article.getColumnIndex("feed_title");
 			
 			if (ft != null && feedTitleIndex != -1 && m_feedIsCat) {				
-				String feedTitle = article.getString(feedTitleIndex).substring(0, 30);
+				String feedTitle = article.getString(feedTitleIndex);
+				
+				if (feedTitle.length() > 20)
+					feedTitle = feedTitle.substring(0, 20) + "...";
 				
 				if (feedTitle != null) {
 					ft.setText(feedTitle);