From 7e7103db7a051e510167b58255e631532236f048 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 16 Feb 2018 10:44:48 +0100
Subject: [PATCH] Updated delete dialog message for chat rooms

---
 res/values-fr/strings.xml                            | 1 +
 res/values/strings.xml                               | 1 +
 src/android/org/linphone/chat/ChatListFragment.java  | 1 +
 src/android/org/linphone/ui/ListSelectionHelper.java | 9 ++++++++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fc2adadb1..fc9dc5c8c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -198,6 +198,7 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="admin_unset">%s n\'est plus admin</string>
   <string name="chat_room_leave_dialog">Souhaitez-vous vraiment quitter ce groupe ?</string>
   <string name="chat_room_leave_button">Quitter</string>
+  <string name="chat_room_delete_dialog">Voulez-vous supprimer et quitter les discussions sélectionnées ?</string>
   <string name="separator">&#160;:&#160;</string>
   <!--Status Bar-->
   <string name="status_connected">Enregistré</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3f4e32f6e..bbbd4262c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -217,6 +217,7 @@
     <string name="chat_room_creation_failed">Chat room creation failed</string>
     <string name="chat_room_leave_dialog">Do you really want to leave this group?</string>
     <string name="chat_room_leave_button">Leave</string>
+    <string name="chat_room_delete_dialog">Do you want to delete and leave the selected conversations?</string>
     <string name="separator">:&#160;</string>
 
     <!-- Status Bar -->
diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java
index 05c3c4bd7..002c5e858 100644
--- a/src/android/org/linphone/chat/ChatListFragment.java
+++ b/src/android/org/linphone/chat/ChatListFragment.java
@@ -69,6 +69,7 @@ public class ChatListFragment extends Fragment implements OnItemClickListener, C
 		mSelectionHelper = new ListSelectionHelper(view, this);
 		mChatRoomsAdapter = new ChatRoomsAdapter(getActivity(), mSelectionHelper, mInflater);
 		mSelectionHelper.setAdapter(mChatRoomsAdapter);
+		mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog);
 
 		mWaitLayout = view.findViewById(R.id.waitScreen);
 		mWaitLayout.setVisibility(View.GONE);
diff --git a/src/android/org/linphone/ui/ListSelectionHelper.java b/src/android/org/linphone/ui/ListSelectionHelper.java
index 5f337f40e..8a039f84b 100644
--- a/src/android/org/linphone/ui/ListSelectionHelper.java
+++ b/src/android/org/linphone/ui/ListSelectionHelper.java
@@ -35,6 +35,11 @@ public class ListSelectionHelper {
 	private ListSelectionAdapter mAdapter;
 	private DeleteListener mDeleteListener;
 	private Context mContext;
+	private int mDialogDeleteMessageResourceId;
+
+	public void setDialogMessage(int id) {
+		mDialogDeleteMessageResourceId = id;
+	}
 
 	public interface DeleteListener {
 		void onDeleteSelection(Object[] objectsToDelete);
@@ -86,7 +91,7 @@ public class ListSelectionHelper {
 		mDeleteSelectionButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				final Dialog dialog = LinphoneActivity.instance().displayDialog(mContext.getString(R.string.delete_text));
+				final Dialog dialog = LinphoneActivity.instance().displayDialog(mContext.getString(mDialogDeleteMessageResourceId));
 				Button delete = dialog.findViewById(R.id.delete_button);
 				Button cancel = dialog.findViewById(R.id.cancel);
 
@@ -109,6 +114,8 @@ public class ListSelectionHelper {
 				dialog.show();
 			}
 		});
+
+		mDialogDeleteMessageResourceId = R.string.delete_text;
 	}
 
 	public void setAdapter(ListSelectionAdapter adapter) {