Implements FS#64: Show who wrote last message in conversation overview

1 files changed, 12 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
index b6d861d4..590a6cfd 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
@@ -112,7 +112,17 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			mLastMessage.setVisibility(View.VISIBLE);
 			imagePreview.setVisibility(View.GONE);
             CharSequence msgText = preview.first;
-			mLastMessage.setText(msgText);
+            String msgPrefix = null;
+			if (message.getStatus() == Message.STATUS_SEND
+                    || message.getStatus() == Message.STATUS_SEND_DISPLAYED
+                    || message.getStatus() == Message.STATUS_SEND_FAILED
+                    || message.getStatus() == Message.STATUS_SEND_RECEIVED) {
+                msgPrefix = activity.getString(R.string.cplus_me);
+            } else if (conversation.getMode() == Conversation.MODE_MULTI) {
+                msgPrefix = UIHelper.getMessageDisplayName(message);
+            }
+            String lastMessagePreview = ((null == msgPrefix || msgPrefix.isEmpty()) ? "" : (msgPrefix + ": ")) + msgText;
+			mLastMessage.setText(lastMessagePreview);
 			if (preview.second) {
 				if (conversation.isRead()) {
 					mLastMessage.setTypeface(null, Typeface.ITALIC);
@@ -128,7 +138,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			}
 		}
 
-		mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
+		mTimestamp.setText(UIHelper.readableTimeDifference(activity, message.getTimeSent()));
 		ImageView profilePicture = (ImageView) view.findViewById(R.id.conversation_image);
 		profilePicture.setOnLongClickListener(new ShowResourcesListDialogListener(activity, conversation.getContact()));
 		loadAvatar(conversation, profilePicture);