From 3fe92f7f713918ec021e84802048c33d066d7b3d Mon Sep 17 00:00:00 2001
From: Lucas Legrand <lucas.legrand@belledonne-communications.com>
Date: Fri, 20 Jul 2018 15:45:17 +0200
Subject: [PATCH] No chat_bubble displayed, save this stage to go back and
 remove code to go forward step by step

---
 res/layout/chat.xml                           |   4 +-
 .../linphone/chat/ChatBubbleViewHolder.java   |  59 +-
 .../org/linphone/chat/ChatEventsAdapter.java  | 526 ++++++++----------
 .../org/linphone/chat/ChatListFragment.java   |   3 +-
 .../org/linphone/chat/GroupChatFragment.java  |  59 +-
 .../org/linphone/chat/ImdnFragment.java       |   2 +-
 .../org/linphone/ui/SelectableAdapter.java    |   2 +-
 7 files changed, 327 insertions(+), 328 deletions(-)

diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index bc66da93e..7d8a36867 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -173,7 +173,9 @@
 		android:layout_height="wrap_content"
 		android:layout_above="@id/footer"/>
 
-	<ListView
+	<!--<ListView-->
+	<android.support.v7.widget.RecyclerView
+
 		android:id="@+id/chat_message_list"
 		android:divider="@android:color/transparent"
 		android:choiceMode="multipleChoice"
diff --git a/src/android/org/linphone/chat/ChatBubbleViewHolder.java b/src/android/org/linphone/chat/ChatBubbleViewHolder.java
index 00bcc852e..d828c8a29 100644
--- a/src/android/org/linphone/chat/ChatBubbleViewHolder.java
+++ b/src/android/org/linphone/chat/ChatBubbleViewHolder.java
@@ -35,8 +35,9 @@ import org.linphone.R;
 import org.linphone.core.ChatMessage;
 import org.linphone.core.ChatRoom;
 import org.linphone.core.EventLog;
+import org.linphone.core.LimeState;
 
-public class ChatBubbleViewHolder extends RecyclerView.ViewHolder{
+public class ChatBubbleViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener{
 	public String messageId;
     public EventLog mEvent;
     public ChatMessage message;
@@ -67,9 +68,11 @@ public class ChatBubbleViewHolder extends RecyclerView.ViewHolder{
 	public Button openFileButton;
 
 	public CheckBox delete;
+	private ClickListener listener;
 
-	public ChatBubbleViewHolder(View view) {
+	public ChatBubbleViewHolder(View view, ClickListener listener) {
 		super(view);
+		this.listener = listener;
 		eventLayout = view.findViewById(R.id.event);
 	    //eventTime = view.findViewById(R.id.event_date);
 	    eventMessage = view.findViewById(R.id.event_text);
@@ -97,26 +100,44 @@ public class ChatBubbleViewHolder extends RecyclerView.ViewHolder{
 	    openFileButton = view.findViewById(R.id.open_file);
 
 	    delete = view.findViewById(R.id.delete_message);
+		view.setOnClickListener(this);
 	}
+	public ChatBubbleViewHolder(View view) {
+		super(view);
+		this.listener = listener;
+		eventLayout = view.findViewById(R.id.event);
+		//eventTime = view.findViewById(R.id.event_date);
+		eventMessage = view.findViewById(R.id.event_text);
 
-    public void bindEvent(EventLog event) {
+		bubbleLayout = view.findViewById(R.id.bubble);
+		background = view.findViewById(R.id.background);
+		contactPicture = view.findViewById(R.id.contact_picture);
+		contactPictureMask = view.findViewById(R.id.mask);
+		contactName = view.findViewById(R.id.contact_header);
 
-        //Bind the data to the ViewHolder
-        this.mEvent = event;
-        this.message = event.getChatMessage();
-        this.messageId = message.getMessageId();
+		messageStatus = view.findViewById(R.id.status);
+		messageSendingInProgress = view.findViewById(R.id.inprogress);
+		imdmLayout = view.findViewById(R.id.imdmLayout);
+		imdmIcon = view.findViewById(R.id.imdmIcon);
+		imdmLabel = view.findViewById(R.id.imdmText);
 
-        this.eventLayout.setVisibility(event.getType() == EventLog.Type.ConferenceChatMessage ? View.GONE : View.VISIBLE);
-        this.bubbleLayout.setVisibility(event.getType() == EventLog.Type.ConferenceChatMessage ? View.VISIBLE : View.GONE);
-        this.messageText.setVisibility(event.getType() == EventLog.Type.ConferenceChatMessage ? View.VISIBLE : View.GONE);
-        this.messageImage.setVisibility(View.GONE);
-        this.fileTransferLayout.setVisibility(View.GONE);
+		messageText = view.findViewById(R.id.message);
+		messageImage = view.findViewById(R.id.image);
 
-        this.lastMessageSenderView.setText(getSender(mRoom));
-        this.lastMessageView.setText(mRoom.getLastMessageInHistory() != null ? mRoom.getLastMessageInHistory().getTextContent(): "");
-        this.date.setText(mRoom.getLastMessageInHistory()!=null ? LinphoneUtils.timestampToHumanDate(this.mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format) : "");
-        this.displayName.setText(getContact(mRoom));
-        this.unreadMessages.setText(String.valueOf(LinphoneManager.getInstance().getUnreadCountForChatRoom(mRoom)));
-        getAvatar(mRoom);
-    }
+		fileTransferLayout = view.findViewById(R.id.file_transfer_layout);
+		fileTransferProgressBar = view.findViewById(R.id.progress_bar);
+		fileTransferAction = view.findViewById(R.id.file_transfer_action);
+
+		fileName = view.findViewById(R.id.file_name);
+		openFileButton = view.findViewById(R.id.open_file);
+
+		delete = view.findViewById(R.id.delete_message);
+	}
+	@Override
+	public void onClick(View v) {
+		listener.onItemClicked(getAdapterPosition());	}
+
+	public interface ClickListener {
+		public void onItemClicked(int position);
+	}
 }
\ No newline at end of file
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 706d353d4..a101e30ee 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -64,6 +64,7 @@ import org.linphone.core.LimeState;
 import org.linphone.mediastream.Log;
 import org.linphone.ui.ListSelectionAdapter;
 import org.linphone.ui.ListSelectionHelper;
+import org.linphone.ui.SelectableAdapter;
 import org.linphone.ui.SelectableHelper;
 
 import java.io.File;
@@ -76,27 +77,28 @@ import java.util.List;
 
 import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
 
-public class ChatEventsAdapter extends RecyclerView.Adapter<ChatBubbleViewHolder> {
+public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
+//public class ChatEventsAdapter extends RecyclerView.Adapter<ChatBubbleViewHolder> {
 	private Context mContext;
     private List<EventLog> mHistory;
 	private List<LinphoneContact> mParticipants;
     private LayoutInflater mLayoutInflater;
-//	private int itemResource;
 	private Bitmap mDefaultBitmap;
 	private GroupChatFragment mFragment;
 	private ChatMessageListenerStub mListener;
+	private ChatBubbleViewHolder.ClickListener clickListener;
 
 //    public ChatEventsAdapter(GroupChatFragment fragment, ListSelectionHelper helper, LayoutInflater inflater, EventLog[] history, ArrayList<LinphoneContact> participants) {
-    public ChatEventsAdapter(GroupChatFragment fragment, ListSelectionHelper helper, LayoutInflater inflater, EventLog[] history, ArrayList<LinphoneContact> participants) {
-//	public ChatRoomsAdapter(Context context, int itemResource, List<ChatRoom > mRooms, ChatRoomViewHolder.ClickListener clickListener, SelectableHelper	helper) {
+    public ChatEventsAdapter(GroupChatFragment fragment, SelectableHelper helper, LayoutInflater inflater, ArrayList<EventLog> mHistory, ArrayList<LinphoneContact> participants, ChatBubbleViewHolder.ClickListener clickListener) {
+//    public ChatEventsAdapter(GroupChatFragment fragment, SelectableHelper helper, LayoutInflater inflater, ArrayList<EventLog> mHistory, ArrayList<LinphoneContact> participants, ChatBubbleViewHolder.ClickListener clickListener) {
 
-		super();
-	    mFragment = fragment;
-	    mContext = mFragment.getActivity();
+		super(helper);
+	    this.mFragment = fragment;
+	    this.mContext = mFragment.getActivity();
 //		itemResource = inflater.;
-        mLayoutInflater = inflater;
-        mHistory = new ArrayList<>(Arrays.asList(history));
-	    mParticipants = participants;
+        this.mLayoutInflater = inflater;
+        this.mHistory = mHistory;
+	    this.mParticipants = participants;
 
 	    mListener = new ChatMessageListenerStub() {
 		    @Override
@@ -132,58 +134,260 @@ public class ChatEventsAdapter extends RecyclerView.Adapter<ChatBubbleViewHolder
     @Override
     public ChatBubbleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View v = mLayoutInflater.inflate(R.layout.chat_bubble, parent, false);
-		return new ChatBubbleViewHolder(v);
+		return new ChatBubbleViewHolder(v, clickListener);
     }
 
     @Override
     public void onBindViewHolder(@NonNull ChatBubbleViewHolder holder, int position) {
 		EventLog event = (EventLog)getItem(position);
-		final ChatMessage message = event.getChatMessage();
 
+		holder.eventLayout.setVisibility(View.GONE);
+		holder.bubbleLayout.setVisibility(View.GONE);
+		holder.delete.setVisibility(isEditionEnabled() ? View.VISIBLE : View.GONE);
+		holder.messageText.setVisibility(View.GONE);
+		holder.messageImage.setVisibility(View.GONE);
+		holder.fileTransferLayout.setVisibility(View.GONE);
+		holder.fileTransferProgressBar.setProgress(0);
+		holder.fileTransferAction.setEnabled(true);
+		holder.fileName.setVisibility(View.GONE);
+		holder.openFileButton.setVisibility(View.GONE);
+		holder.messageStatus.setVisibility(View.INVISIBLE);
+		holder.messageSendingInProgress.setVisibility(View.GONE);
+		holder.imdmLayout.setVisibility(View.INVISIBLE);
+		holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
 		//Apply generic bindings
-		holder.bindEvent(event);
 
-//		holder.delete.setVisibility(this.isEditionEnabled() == true ? View.VISIBLE : View.INVISIBLE);
-//		holder.delete.setChecked(isSelected(position) ? true : false);
-
-		RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+		if (isEditionEnabled()) {
+			holder.delete.setOnCheckedChangeListener(null);
+			holder.delete.setChecked(isSelected(position));
+			holder.delete.setTag(position);
+			holder.delete.setOnCheckedChangeListener(getDeleteListener());
+		}
 
 		//If event is Chat Message
 		if(event.getType() == EventLog.Type.ConferenceChatMessage) {
+			holder.bubbleLayout.setVisibility(View.VISIBLE);
 
+			final ChatMessage message = event.getChatMessage();
+			holder.messageId = message.getMessageId();
+			message.setUserData(holder);
 
-			//layoutParams Settings
+			RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
 
+			ChatMessage.State status = message.getState();
+			Address remoteSender = message.getFromAddress();
+			String displayName;
 
+			LinphoneContact contact = null;
+			if (message.isOutgoing()) {
+				message.setListener(mListener);
 
-			if (isEditionEnabled()) {
-				layoutParams.addRule(RelativeLayout.LEFT_OF, holder.delete.getId());
-				layoutParams.setMargins(100, 10, 10, 10);
-			} else if (message.isOutgoing()) {
-				layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-				layoutParams.setMargins(100, 10, 10, 10);
+				if (status == ChatMessage.State.InProgress) {
+					holder.messageSendingInProgress.setVisibility(View.VISIBLE);
+				}
 
+				if (!message.isSecured() && LinphoneManager.getLc().limeEnabled() == LimeState.Mandatory && status != ChatMessage.State.InProgress) {
+					holder.messageStatus.setVisibility(View.VISIBLE);
+					holder.messageStatus.setImageResource(R.drawable.chat_unsecure);
+				}
+
+				if (status == ChatMessage.State.Delivered) {
+				    /*holder.imdmLayout.setVisibility(View.VISIBLE);
+				    holder.imdmLabel.setText(R.string.sent);
+				    holder.imdmIcon.setImageResource(R.drawable.chat_delivered);
+				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorD));*/
+				} else if (status == ChatMessage.State.DeliveredToUser) {
+					holder.imdmLayout.setVisibility(View.VISIBLE);
+					holder.imdmIcon.setImageResource(R.drawable.chat_delivered);
+					holder.imdmLabel.setText(R.string.delivered);
+					holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorD));
+				} else if (status == ChatMessage.State.Displayed) {
+					holder.imdmLayout.setVisibility(View.VISIBLE);
+					holder.imdmIcon.setImageResource(R.drawable.chat_read);
+					holder.imdmLabel.setText(R.string.displayed);
+					holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorK));
+				} else if (status == ChatMessage.State.NotDelivered) {
+					holder.imdmLayout.setVisibility(View.VISIBLE);
+					holder.imdmIcon.setImageResource(R.drawable.chat_error);
+					holder.imdmLabel.setText(R.string.error);
+					holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorI));
+				} else if (status == ChatMessage.State.FileTransferError) {
+					holder.imdmLayout.setVisibility(View.VISIBLE);
+					holder.imdmIcon.setImageResource(R.drawable.chat_error);
+					holder.imdmLabel.setText(R.string.file_transfer_error);
+					holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorI));
+				}
+
+				if (isEditionEnabled()) {
+					layoutParams.addRule(RelativeLayout.LEFT_OF, holder.delete.getId());
+					layoutParams.setMargins(100, 10, 10, 10);
+				} else {
+					layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+					layoutParams.setMargins(100, 10, 10, 10);
+				}
+
+				holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_outgoing);
+				Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font3);
+				Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font15);
+				holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_confirm_delete_button);
+				holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask_outgoing);
 			} else {
-				layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-				layoutParams.setMargins(10, 10, 100, 10);
+				for (LinphoneContact c : mParticipants) {
+					if (c != null && c.hasAddress(remoteSender.asStringUriOnly())) {
+						contact = c;
+						break;
+					}
+				}
+
+				if (isEditionEnabled()) {
+					layoutParams.addRule(RelativeLayout.LEFT_OF, holder.delete.getId());
+					layoutParams.setMargins(100, 10, 10, 10);
+				} else {
+					layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+					layoutParams.setMargins(10, 10, 100, 10);
+				}
+
+				holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
+				Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font9);
+				Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font8);
+				holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
+				holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask);
 			}
 
+			if (contact == null) {
+				contact = ContactsManager.getInstance().findContactFromAddress(remoteSender);
+			}
+			if (contact != null) {
+				if (contact.getFullName() != null) {
+					displayName = contact.getFullName();
+				} else {
+					displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
+				}
 
-			//Display attached files
-			if (message.getAppdata() != null) {
+				holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
+				if (contact.hasPhoto()) {
+					LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri());
+				}
+			} else {
+				displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
+				holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
+			}
+			holder.contactName.setText(LinphoneUtils.timestampToHumanDate(mContext, message.getTime(), R.string.messages_date_format) + " - " + displayName);
+
+			if (message.hasTextContent()) {
+				String msg = message.getTextContent();
+				Spanned text = LinphoneUtils.getTextWithHttpLinks(msg);
+				holder.messageText.setText(text);
+				holder.messageText.setMovementMethod(LinkMovementMethod.getInstance());
+				holder.messageText.setVisibility(View.VISIBLE);
+			}
+
+			String externalBodyUrl = message.getExternalBodyUrl();
+			Content fileTransferContent = message.getFileTransferInformation();
+
+			if (message.getAppdata() != null) { // Something to display
 				displayAttachedFile(message, holder);
 			}
 
+			if (externalBodyUrl != null) { // Incoming file transfer not yet downloaded
+				holder.fileName.setVisibility(View.VISIBLE);
+				holder.fileName.setText(fileTransferContent.getName());
 
-			if (message.getExternalBodyUrl() != null ) {
+				holder.fileTransferLayout.setVisibility(View.VISIBLE);
 				holder.fileTransferProgressBar.setVisibility(View.GONE);
+				if (message.isFileTransferInProgress()) { // Incoming file transfer in progress
+					holder.fileTransferAction.setVisibility(View.GONE);
+				} else {
+					holder.fileTransferAction.setText(mContext.getString(R.string.accept));
+//					holder.fileTransferAction.setOnClickListener(new View.OnClickListener() {
+//						@Override
+//						public void onClick(View v) {
+//							if (mContext.getPackageManager().checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, mContext.getPackageName()) == PackageManager.PERMISSION_GRANTED) {
+//								v.setEnabled(false);
+//								String filename = message.getFileTransferInformation().getName();
+//								File file = new File(Environment.getExternalStorageDirectory(), filename);
+//								int prefix = 1;
+//								while (file.exists()) {
+//									file = new File(Environment.getExternalStorageDirectory(), prefix + "_" + filename);
+//									Log.w("File with that name already exists, renamed to " + prefix + "_" + filename);
+//									prefix += 1;
+//								}
+//								message.setListener(mListener);
+//								message.setFileTransferFilepath(file.getPath());
+//								message.downloadFile();
+//
+//							} else {
+//								Log.w("WRITE_EXTERNAL_STORAGE permission not granted, won't be able to store the downloaded file");
+//								LinphoneActivity.instance().checkAndRequestExternalStoragePermission();
+//							}
+//						}
+//					});
+				}
+			} else if (message.isFileTransferInProgress()) { // Outgoing file transfer in progress
+				message.setListener(mListener); // add the listener for file upload progress display
+				holder.messageSendingInProgress.setVisibility(View.GONE);
 				holder.fileTransferLayout.setVisibility(View.VISIBLE);
+				holder.fileTransferAction.setText(mContext.getString(R.string.cancel));
+//				holder.fileTransferAction.setOnClickListener(new View.OnClickListener() {
+//					@Override
+//					public void onClick(View v) {
+//						message.cancelFileTransfer();
+//						notifyDataSetChanged();
+//					}
+//				});
 			}
 
-			if (message.isFileTransferInProgress()){
-				holder.fileTransferLayout.setVisibility(View.VISIBLE);
+			holder.bubbleLayout.setLayoutParams(layoutParams);
+		} else { // Event is not chat message
+			holder.eventLayout.setVisibility(View.VISIBLE);
+
+			Address address = event.getParticipantAddress();
+			String displayName = null;
+			if (address != null) {
+				LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(address);
+				if (contact != null) {
+					displayName = contact.getFullName();
+				} else {
+					displayName = LinphoneUtils.getAddressDisplayName(address);
+				}
 			}
 
+			switch (event.getType()) {
+				case ConferenceCreated:
+					holder.eventMessage.setText(mContext.getString(R.string.conference_created));
+					break;
+				case ConferenceTerminated:
+					holder.eventMessage.setText(mContext.getString(R.string.conference_destroyed));
+					break;
+				case ConferenceParticipantAdded:
+					holder.eventMessage.setText(mContext.getString(R.string.participant_added).replace("%s", displayName));
+					break;
+				case ConferenceParticipantRemoved:
+					holder.eventMessage.setText(mContext.getString(R.string.participant_removed).replace("%s", displayName));
+					break;
+				case ConferenceSubjectChanged:
+					holder.eventMessage.setText(mContext.getString(R.string.subject_changed).replace("%s", event.getSubject()));
+					break;
+				case ConferenceParticipantSetAdmin:
+					holder.eventMessage.setText(mContext.getString(R.string.admin_set).replace("%s", displayName));
+					break;
+				case ConferenceParticipantUnsetAdmin:
+					holder.eventMessage.setText(mContext.getString(R.string.admin_unset).replace("%s", displayName));
+					break;
+				case ConferenceParticipantDeviceAdded:
+					holder.eventMessage.setText(mContext.getString(R.string.device_added).replace("%s", displayName));
+					break;
+				case ConferenceParticipantDeviceRemoved:
+					holder.eventMessage.setText(mContext.getString(R.string.device_removed).replace("%s", displayName));
+					break;
+				case None:
+				default:
+					//TODO
+					break;
+			}
+
+
+
 		}
     }
 
@@ -210,7 +414,7 @@ public class ChatEventsAdapter extends RecyclerView.Adapter<ChatBubbleViewHolder
     }
 
     public void refresh(EventLog[] history) {
-		mHistory = new ArrayList<>(Arrays.asList(history));
+//		mHistory = new ArrayList<>(Arrays.asList(history));
 	    notifyDataSetChanged();
     }
 
@@ -244,264 +448,6 @@ public class ChatEventsAdapter extends RecyclerView.Adapter<ChatBubbleViewHolder
     	notifyDataSetChanged();
     }
 
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        ChatBubbleViewHolder holder;
-        if (view != null) {
-            holder = (ChatBubbleViewHolder) view.getTag();
-        } else {
-            view = mLayoutInflater.inflate(R.layout.chat_bubble, null);
-            holder = new ChatBubbleViewHolder(view);
-            view.setTag(holder);
-        }
-
-	    holder.eventLayout.setVisibility(View.GONE);
-	    holder.bubbleLayout.setVisibility(View.GONE);
-	    holder.delete.setVisibility(isEditionEnabled() ? View.VISIBLE : View.GONE);
-	    holder.messageText.setVisibility(View.GONE);
-	    holder.messageImage.setVisibility(View.GONE);
-	    holder.fileTransferLayout.setVisibility(View.GONE);
-	    holder.fileTransferProgressBar.setProgress(0);
-	    holder.fileTransferAction.setEnabled(true);
-	    holder.fileName.setVisibility(View.GONE);
-	    holder.openFileButton.setVisibility(View.GONE);
-	    holder.messageStatus.setVisibility(View.INVISIBLE);
-	    holder.messageSendingInProgress.setVisibility(View.GONE);
-	    holder.imdmLayout.setVisibility(View.INVISIBLE);
-	    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
-
-	    if (isEditionEnabled()) {
-		    holder.delete.setOnCheckedChangeListener(null);
-		    holder.delete.setChecked(getSelectedItemsPosition().contains(i));
-		    holder.delete.setTag(i);
-		    holder.delete.setOnCheckedChangeListener(getDeleteListener());
-	    }
-
-	    EventLog event = (EventLog)getItem(i);
-	    if (event.getType() == EventLog.Type.ConferenceChatMessage) {
-		    holder.bubbleLayout.setVisibility(View.VISIBLE);
-
-		    final ChatMessage message = event.getChatMessage();
-		    holder.messageId = message.getMessageId();
-		    message.setUserData(holder);
-
-		    RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
-
-		    ChatMessage.State status = message.getState();
-		    Address remoteSender = message.getFromAddress();
-			String displayName;
-
-		    LinphoneContact contact = null;
-		    if (message.isOutgoing()) {
-			    message.setListener(mListener);
-
-			    if (status == ChatMessage.State.InProgress) {
-				    holder.messageSendingInProgress.setVisibility(View.VISIBLE);
-			    }
-
-			    if (!message.isSecured() && LinphoneManager.getLc().limeEnabled() == LimeState.Mandatory && status != ChatMessage.State.InProgress) {
-				    holder.messageStatus.setVisibility(View.VISIBLE);
-				    holder.messageStatus.setImageResource(R.drawable.chat_unsecure);
-			    }
-
-			    if (status == ChatMessage.State.Delivered) {
-				    /*holder.imdmLayout.setVisibility(View.VISIBLE);
-				    holder.imdmLabel.setText(R.string.sent);
-				    holder.imdmIcon.setImageResource(R.drawable.chat_delivered);
-				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorD));*/
-			    } else if (status == ChatMessage.State.DeliveredToUser) {
-				    holder.imdmLayout.setVisibility(View.VISIBLE);
-				    holder.imdmIcon.setImageResource(R.drawable.chat_delivered);
-				    holder.imdmLabel.setText(R.string.delivered);
-				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorD));
-			    } else if (status == ChatMessage.State.Displayed) {
-				    holder.imdmLayout.setVisibility(View.VISIBLE);
-				    holder.imdmIcon.setImageResource(R.drawable.chat_read);
-				    holder.imdmLabel.setText(R.string.displayed);
-				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorK));
-			    } else if (status == ChatMessage.State.NotDelivered) {
-				    holder.imdmLayout.setVisibility(View.VISIBLE);
-				    holder.imdmIcon.setImageResource(R.drawable.chat_error);
-				    holder.imdmLabel.setText(R.string.error);
-				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorI));
-			    } else if (status == ChatMessage.State.FileTransferError) {
-				    holder.imdmLayout.setVisibility(View.VISIBLE);
-				    holder.imdmIcon.setImageResource(R.drawable.chat_error);
-				    holder.imdmLabel.setText(R.string.file_transfer_error);
-				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorI));
-			    }
-
-			    if (isEditionEnabled()) {
-				    layoutParams.addRule(RelativeLayout.LEFT_OF, holder.delete.getId());
-				    layoutParams.setMargins(100, 10, 10, 10);
-			    } else {
-				    layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-				    layoutParams.setMargins(100, 10, 10, 10);
-			    }
-
-			    holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_outgoing);
-			    Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font3);
-			    Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font15);
-			    holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_confirm_delete_button);
-			    holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask_outgoing);
-		    } else {
-			    for (LinphoneContact c : mParticipants) {
-				    if (c != null && c.hasAddress(remoteSender.asStringUriOnly())) {
-					    contact = c;
-					    break;
-				    }
-			    }
-
-			    if (isEditionEnabled()) {
-				    layoutParams.addRule(RelativeLayout.LEFT_OF, holder.delete.getId());
-				    layoutParams.setMargins(100, 10, 10, 10);
-			    } else {
-				    layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-				    layoutParams.setMargins(10, 10, 100, 10);
-			    }
-
-			    holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
-			    Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font9);
-			    Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font8);
-			    holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
-			    holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask);
-		    }
-
-		    if (contact == null) {
-			    contact = ContactsManager.getInstance().findContactFromAddress(remoteSender);
-		    }
-		    if (contact != null) {
-			    if (contact.getFullName() != null) {
-				    displayName = contact.getFullName();
-			    } else {
-				    displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
-			    }
-
-			    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
-			    if (contact.hasPhoto()) {
-				    LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri());
-			    }
-		    } else {
-			    displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
-			    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
-		    }
-		    holder.contactName.setText(LinphoneUtils.timestampToHumanDate(mContext, message.getTime(), R.string.messages_date_format) + " - " + displayName);
-
-		    if (message.hasTextContent()) {
-			    String msg = message.getTextContent();
-			    Spanned text = LinphoneUtils.getTextWithHttpLinks(msg);
-			    holder.messageText.setText(text);
-			    holder.messageText.setMovementMethod(LinkMovementMethod.getInstance());
-			    holder.messageText.setVisibility(View.VISIBLE);
-		    }
-
-		    String externalBodyUrl = message.getExternalBodyUrl();
-		    Content fileTransferContent = message.getFileTransferInformation();
-
-		    if (message.getAppdata() != null) { // Something to display
-				displayAttachedFile(message, holder);
-		    }
-
-		    if (externalBodyUrl != null) { // Incoming file transfer not yet downloaded
-			    holder.fileName.setVisibility(View.VISIBLE);
-			    holder.fileName.setText(fileTransferContent.getName());
-
-			    holder.fileTransferLayout.setVisibility(View.VISIBLE);
-			    holder.fileTransferProgressBar.setVisibility(View.GONE);
-			    if (message.isFileTransferInProgress()) { // Incoming file transfer in progress
-				    holder.fileTransferAction.setVisibility(View.GONE);
-			    } else {
-				    holder.fileTransferAction.setText(mContext.getString(R.string.accept));
-				    holder.fileTransferAction.setOnClickListener(new View.OnClickListener() {
-					    @Override
-					    public void onClick(View v) {
-						    if (mContext.getPackageManager().checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, mContext.getPackageName()) == PackageManager.PERMISSION_GRANTED) {
-							    v.setEnabled(false);
-							    String filename = message.getFileTransferInformation().getName();
-							    File file = new File(Environment.getExternalStorageDirectory(), filename);
-							    int prefix = 1;
-							    while (file.exists()) {
-								    file = new File(Environment.getExternalStorageDirectory(), prefix + "_" + filename);
-								    Log.w("File with that name already exists, renamed to " + prefix + "_" + filename);
-								    prefix += 1;
-							    }
-							    message.setListener(mListener);
-							    message.setFileTransferFilepath(file.getPath());
-							    message.downloadFile();
-
-						    } else {
-							    Log.w("WRITE_EXTERNAL_STORAGE permission not granted, won't be able to store the downloaded file");
-							    LinphoneActivity.instance().checkAndRequestExternalStoragePermission();
-						    }
-					    }
-				    });
-			    }
-		    } else if (message.isFileTransferInProgress()) { // Outgoing file transfer in progress
-				message.setListener(mListener); // add the listener for file upload progress display
-				holder.messageSendingInProgress.setVisibility(View.GONE);
-				holder.fileTransferLayout.setVisibility(View.VISIBLE);
-				holder.fileTransferAction.setText(mContext.getString(R.string.cancel));
-				holder.fileTransferAction.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						message.cancelFileTransfer();
-						notifyDataSetChanged();
-					}
-				});
-			}
-
-		    holder.bubbleLayout.setLayoutParams(layoutParams);
-	    } else { // Event is not chat message
-		    holder.eventLayout.setVisibility(View.VISIBLE);
-
-		    Address address = event.getParticipantAddress();
-		    String displayName = null;
-		    if (address != null) {
-			    LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(address);
-			    if (contact != null) {
-				    displayName = contact.getFullName();
-			    } else {
-				    displayName = LinphoneUtils.getAddressDisplayName(address);
-			    }
-		    }
-
-		    switch (event.getType()) {
-			    case ConferenceCreated:
-				    holder.eventMessage.setText(mContext.getString(R.string.conference_created));
-			    	break;
-			    case ConferenceTerminated:
-				    holder.eventMessage.setText(mContext.getString(R.string.conference_destroyed));
-			    	break;
-			    case ConferenceParticipantAdded:
-				    holder.eventMessage.setText(mContext.getString(R.string.participant_added).replace("%s", displayName));
-			    	break;
-			    case ConferenceParticipantRemoved:
-				    holder.eventMessage.setText(mContext.getString(R.string.participant_removed).replace("%s", displayName));
-			    	break;
-			    case ConferenceSubjectChanged:
-				    holder.eventMessage.setText(mContext.getString(R.string.subject_changed).replace("%s", event.getSubject()));
-			    	break;
-			    case ConferenceParticipantSetAdmin:
-				    holder.eventMessage.setText(mContext.getString(R.string.admin_set).replace("%s", displayName));
-			    	break;
-			    case ConferenceParticipantUnsetAdmin:
-				    holder.eventMessage.setText(mContext.getString(R.string.admin_unset).replace("%s", displayName));
-			    	break;
-			    case ConferenceParticipantDeviceAdded:
-				    holder.eventMessage.setText(mContext.getString(R.string.device_added).replace("%s", displayName));
-				    break;
-			    case ConferenceParticipantDeviceRemoved:
-				    holder.eventMessage.setText(mContext.getString(R.string.device_removed).replace("%s", displayName));
-				    break;
-			    case None:
-			    default:
-			    	//TODO
-			    	break;
-		    }
-	    }
-
-        return view;
-    }
 
 	private void loadBitmap(String path, ImageView imageView) {
 		if (cancelPotentialWork(path, imageView)) {
diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java
index 2e248b1c7..f7926e970 100644
--- a/src/android/org/linphone/chat/ChatListFragment.java
+++ b/src/android/org/linphone/chat/ChatListFragment.java
@@ -92,10 +92,9 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene
 
 		//Creation and affectation of adapter to the RecyclerView
 		mSelectionHelper = new SelectableHelper(view, this);
-
         mChatRoomsAdapter = new ChatRoomsAdapter(mContext, R.layout.chatlist_cell, mRooms,this, mSelectionHelper);
-		mChatRoomsList.setAdapter(mChatRoomsAdapter);
 
+		mChatRoomsList.setAdapter(mChatRoomsAdapter);
 		mSelectionHelper.setAdapter(mChatRoomsAdapter);
 		mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog);
 
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 9ee74db9a..d176929e2 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -34,6 +34,9 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
 import android.provider.MediaStore;
+import android.support.v7.widget.DefaultItemAnimator;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.ContextMenu;
@@ -77,15 +80,17 @@ import org.linphone.contacts.ContactsUpdatedListener;
 import org.linphone.core.Reason;
 import org.linphone.mediastream.Log;
 import org.linphone.ui.ListSelectionHelper;
+import org.linphone.ui.SelectableHelper;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static android.content.Context.INPUT_METHOD_SERVICE;
 import static org.linphone.fragments.FragmentsAvailable.CHAT;
 
-public class GroupChatFragment extends Fragment implements ChatRoomListener, ContactsUpdatedListener, ListSelectionHelper.DeleteListener {
+public class GroupChatFragment extends Fragment implements ChatRoomListener, ContactsUpdatedListener, ChatBubbleViewHolder.ClickListener ,SelectableHelper.DeleteListener {
 	private static final int ADD_PHOTO = 1337;
 
 	private ImageView mBackButton, mCallButton, mBackToCallButton, mGroupInfosButton;
@@ -93,11 +98,10 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	private TextView mRoomLabel, mParticipantsLabel, mRemoteComposing;
 	private EditText mMessageTextToSend;
 	private LayoutInflater mInflater;
-	private ListView mChatEventsList;
+	private RecyclerView mChatEventsList;
 	private LinearLayout mFilesUploadLayout;
-	private ListSelectionHelper mSelectionHelper;
-//	private ListSelectionHelper mSelectionHelper;
-
+	private SelectableHelper mSelectionHelper;
+	private Context mContext;
 	private ViewTreeObserver.OnGlobalLayoutListener mKeyboardListener;
 	private Uri mImageToUploadUri;
 	private ChatEventsAdapter mEventsAdapter;
@@ -105,6 +109,8 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	private Address mRemoteSipAddress, mRemoteParticipantAddress;
 	private ChatRoom mChatRoom;
 	private ArrayList<LinphoneContact> mParticipants;
+	private ArrayList<EventLog> mHistory;
+	private LinearLayoutManager layoutManager;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -116,11 +122,14 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			mRemoteSipUri = getArguments().getString("SipUri");
 			mRemoteSipAddress = LinphoneManager.getLc().createAddress(mRemoteSipUri);
 		}
-
-		mInflater = inflater;
+		this.mContext = getActivity().getApplicationContext();
 		View view = inflater.inflate(R.layout.chat, container, false);
+		mChatEventsList = view.findViewById(R.id.chat_message_list);
+		mSelectionHelper = new SelectableHelper(view, this);
 
-		mSelectionHelper = new ListSelectionHelper(view, this);
+
+		layoutManager = new LinearLayoutManager(mContext);
+		mChatEventsList.setLayoutManager(layoutManager);
 
 		mBackButton = view.findViewById(R.id.back);
 		mBackButton.setOnClickListener(new View.OnClickListener() {
@@ -551,18 +560,26 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	private void displayChatRoomHistory() {
 		if (mChatRoom == null) return;
 		if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
-			mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryMessageEvents(0), mParticipants);
+            EventLog[] history = mChatRoom.getHistoryMessageEvents(0);
+			mHistory = new ArrayList<>(Arrays.asList(history));
+            mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mHistory, mParticipants, this);
 //			mChatRoomsAdapter = new ChatRoomsAdapter(mContext, R.layout.chatlist_cell, mRooms,this, mSelectionHelper);
 		} else {
-			mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryEvents(0), mParticipants);
+			EventLog[] history = mChatRoom.getHistoryEvents(0);
+			mHistory = new ArrayList<>(Arrays.asList(history));
+            mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mHistory, mParticipants, this);
 		}
-		mSelectionHelper.setAdapter(mEventsAdapter);
 		mChatEventsList.setAdapter(mEventsAdapter);
-	}
+        mSelectionHelper.setAdapter(mEventsAdapter);
+
+
+    }
 
 	public void scrollToBottom() {
-		if (((mChatEventsList.getLastVisiblePosition() >= (mEventsAdapter.getCount() - 1)) && (mChatEventsList.getFirstVisiblePosition() <= (mEventsAdapter.getCount() - 1)))) {
-			mChatEventsList.setSelection(mEventsAdapter.getCount() - 1);
+		if (((layoutManager.findLastVisibleItemPosition() >= (mEventsAdapter.getCount() - 1)) && (layoutManager.findFirstVisibleItemPosition() <= (mEventsAdapter.getCount() - 1)))) {
+//		if (((mChatEventsList.getLastVisiblePosition() >= (mEventsAdapter.getCount() - 1)) && (mChatEventsList.getFirstVisiblePosition() <= (mEventsAdapter.getCount() - 1)))) {
+			mChatEventsList.getLayoutManager().scrollToPosition(mEventsAdapter.getCount() - 1);
+//			mChatEventsList.setSelection(mEventsAdapter.getCount() - 1);
 		}
 	}
 
@@ -570,6 +587,20 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 		return mRemoteSipUri;
 	}
 
+
+	/*
+	*if isEditionEnabled() true, select the message
+	* */
+
+
+	@Override
+	public void onItemClicked(int position) {
+		if (mEventsAdapter.isEditionEnabled()) {
+			mEventsAdapter.toggleSelection(position);
+		}
+	}
+
+
 	/**
 	 * File transfer related
 	 */
diff --git a/src/android/org/linphone/chat/ImdnFragment.java b/src/android/org/linphone/chat/ImdnFragment.java
index d3ecd797a..ebd7b6249 100644
--- a/src/android/org/linphone/chat/ImdnFragment.java
+++ b/src/android/org/linphone/chat/ImdnFragment.java
@@ -47,7 +47,7 @@ import org.linphone.core.ChatRoom;
 import org.linphone.core.Core;
 import org.linphone.core.ParticipantImdnState;
 
-public class ImdnFragment extends Fragment {
+public class ImdnFragment extends Fragment{
 	private LayoutInflater mInflater;
 	private LinearLayout mRead, mReadHeader, mDelivered, mDeliveredHeader, mSent, mSentHeader, mUndelivered, mUndeliveredHeader;
 	private ImageView mBackButton;
diff --git a/src/android/org/linphone/ui/SelectableAdapter.java b/src/android/org/linphone/ui/SelectableAdapter.java
index f76976d94..ecbda50e4 100644
--- a/src/android/org/linphone/ui/SelectableAdapter.java
+++ b/src/android/org/linphone/ui/SelectableAdapter.java
@@ -17,8 +17,8 @@ public abstract class SelectableAdapter<VH extends RecyclerView.ViewHolder> exte
     public SelectableAdapter(SelectableHelper helper) {
         mSelectedItems = new SparseBooleanArray();
         mListHelper = helper;
-
     }
+
     private CompoundButton.OnCheckedChangeListener mDeleteCheckboxListener = new CompoundButton.OnCheckedChangeListener() {
         @Override
         public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {