From 2baf90b9ef3d87c269b9535b8608036340ce2d44 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Wed, 22 Jun 2016 12:49:23 -0500
Subject: [PATCH] Fixed chat display

---
 Habitica/res/layout/fragment_inbox.xml                       | 3 ++-
 .../habitica/ui/adapter/social/ChatRecyclerViewAdapter.java  | 5 +++++
 .../android/habitica/ui/fragments/social/InboxFragment.java  | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Habitica/res/layout/fragment_inbox.xml b/Habitica/res/layout/fragment_inbox.xml
index 9108559c6..f6d2b1bd3 100644
--- a/Habitica/res/layout/fragment_inbox.xml
+++ b/Habitica/res/layout/fragment_inbox.xml
@@ -25,11 +25,12 @@
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:textSize="@dimen/card_large_text"
                 style="@style/CardView.Default">
                 <LinearLayout
                     android:id="@+id/inbox_messages"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:divider="?android:listDivider"
                     android:showDividers="middle">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
index cf5b655df..4e5b33d4c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
@@ -26,6 +26,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.text.method.LinkMovementMethod;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -238,10 +239,14 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
                 if (userLabel != null) {
                     userLabel.setText(msg.user);
                 }
+
                 DataBindingUtils.setForegroundTintColor(userLabel, msg.getContributorForegroundColor());
 
                 if (messageText != null) {
                     messageText.setText(msg.parsedText);
+                    if (msg.parsedText == null) {
+                        messageText.setText(msg.text);
+                    }
                     this.messageText.setMovementMethod(LinkMovementMethod.getInstance());
                 }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
index 9fa72b491..90edb3653 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
@@ -99,7 +99,6 @@ public class InboxFragment extends BaseMainFragment
     public void onClick(View v) {
         TextView entry = (TextView) v;
         InboxMessageListFragment inboxMessageListFragment = new InboxMessageListFragment();
-        Log.v("test", entry.getText().toString());
         inboxMessageListFragment.setMessages(this.messages, entry.getText().toString());
         this.activity.displayFragment(inboxMessageListFragment);
     }