From 745faa12a7578b1a0b0db4d6f5457600e137f26b Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 18 Nov 2015 16:20:01 -0800
Subject: [PATCH] Fix for outgoing group update display

Fixes #4444
// FREEBIE
---
 .../securesms/ConversationUpdateItem.java             | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java
index 39fa1d82d3..de9e51ebf4 100644
--- a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java
@@ -87,15 +87,8 @@ public class ConversationUpdateItem extends LinearLayout
   private void setGroupRecord(MessageRecord messageRecord) {
     icon.setImageResource(R.drawable.ic_group_grey600_24dp);
 
-    if (messageRecord.isGroupQuit() && messageRecord.isOutgoing()) {
-      body.setText(R.string.MessageRecord_left_group);
-    } else if (messageRecord.isGroupQuit()) {
-      body.setText(getContext().getString(R.string.ConversationItem_group_action_left, sender.toShortString()));
-    } else {
-      GroupUtil.GroupDescription description = GroupUtil.getDescription(getContext(), messageRecord.getBody().getBody());
-      description.addListener(this);
-      body.setText(description.toString());
-    }
+    GroupUtil.getDescription(getContext(), messageRecord.getBody().getBody()).addListener(this);
+    body.setText(messageRecord.getDisplayBody());
 
     date.setVisibility(View.GONE);
   }