From 855b8d0220eeab5fea0613000768f0d315adc076 Mon Sep 17 00:00:00 2001
From: RyanBateman <ryan.bateman@gmail.com>
Date: Wed, 28 Nov 2012 11:24:20 +0000
Subject: [PATCH] Added fixes for encoding issue, null rounding image issue

---
 media/android/NewsBlur/AndroidManifest.xml                  | 4 ++--
 .../src/com/newsblur/fragment/ReadingItemFragment.java      | 6 ++++--
 .../NewsBlur/src/com/newsblur/view/FeedItemViewBinder.java  | 3 +++
 .../src/com/newsblur/test/domain/StoryTest.java             | 5 +++++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 media/android/NewsBlurTest/src/com/newsblur/test/domain/StoryTest.java

diff --git a/media/android/NewsBlur/AndroidManifest.xml b/media/android/NewsBlur/AndroidManifest.xml
index 7e48cc06a..1ab1ba669 100644
--- a/media/android/NewsBlur/AndroidManifest.xml
+++ b/media/android/NewsBlur/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.newsblur"
-    android:versionCode="27"
-    android:versionName="1.0.4" >
+    android:versionCode="29"
+    android:versionName="1.0.55" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/media/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java b/media/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
index b61c7c93c..82bda501e 100644
--- a/media/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
+++ b/media/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
@@ -313,8 +313,10 @@ public class ReadingItemFragment extends Fragment implements ClassifierDialogFra
 				commentText.setTag("commentBy" + user.id);
 				commentText.setText(sharedText);
 
-				ImageView commentImage = (ImageView) commentView.findViewById(R.id.comment_user_image);
-				commentImage.setImageBitmap(UIUtils.roundCorners(PrefsUtils.getUserImage(getActivity()), 10f));
+				if (PrefsUtils.getUserImage(getActivity()) != null) {
+					ImageView commentImage = (ImageView) commentView.findViewById(R.id.comment_user_image);
+					commentImage.setImageBitmap(UIUtils.roundCorners(PrefsUtils.getUserImage(getActivity()), 10f));
+				}
 
 				TextView commentSharedDate = (TextView) commentView.findViewById(R.id.comment_shareddate);
 				commentSharedDate.setText(R.string.now);
diff --git a/media/android/NewsBlur/src/com/newsblur/view/FeedItemViewBinder.java b/media/android/NewsBlur/src/com/newsblur/view/FeedItemViewBinder.java
index 930f9d60a..c62f4c705 100644
--- a/media/android/NewsBlur/src/com/newsblur/view/FeedItemViewBinder.java
+++ b/media/android/NewsBlur/src/com/newsblur/view/FeedItemViewBinder.java
@@ -72,6 +72,9 @@ public class FeedItemViewBinder implements ViewBinder {
 			} catch (UnsupportedEncodingException e) {
 				((TextView) view).setText(Html.fromHtml(cursor.getString(columnIndex)));
 				Log.e(TAG, "Error decoding from title string");
+			}  catch (IllegalArgumentException e) {
+				((TextView) view).setText(Html.fromHtml(cursor.getString(columnIndex)));
+				Log.d(TAG, "Title contained an unescaped character");
 			}
 			return true;
 		}
diff --git a/media/android/NewsBlurTest/src/com/newsblur/test/domain/StoryTest.java b/media/android/NewsBlurTest/src/com/newsblur/test/domain/StoryTest.java
new file mode 100644
index 000000000..b77fd1947
--- /dev/null
+++ b/media/android/NewsBlurTest/src/com/newsblur/test/domain/StoryTest.java
@@ -0,0 +1,5 @@
+package com.newsblur.test.domain;
+
+public class StoryTest {
+
+}