From 1dbca18fe8811f44c53c79853402f0d9198369d9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 30 Nov 2017 15:53:33 +0100
Subject: [PATCH] Changes related to chatRoom readOnly state

---
 src/android/org/linphone/chat/ChatEventsAdapter.java | 2 +-
 src/android/org/linphone/chat/GroupChatFragment.java | 7 ++-----
 src/android/org/linphone/chat/GroupInfoFragment.java | 4 ++--
 submodules/linphone                                  | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 931566b63..9383b872a 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -327,7 +327,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
 			    case ConferenceCreated:
 				    holder.eventMessage.setText(mContext.getString(R.string.conference_created));
 			    	break;
-			    case ConferenceDestroyed:
+			    case ConferenceTerminated:
 				    holder.eventMessage.setText(mContext.getString(R.string.conference_destroyed));
 			    	break;
 			    case ConferenceParticipantAdded:
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index f70fc64bd..1c8489b00 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -82,7 +82,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	private LayoutInflater mInflater;
 	private ListView mChatEventsList;
 	private LinearLayout mFilesUploadLayout;
-	private boolean mIsReadOnly;
 	private ListSelectionHelper mSelectionHelper;
 
 	private ViewTreeObserver.OnGlobalLayoutListener mKeyboardListener;
@@ -374,7 +373,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			mRemoteParticipantAddress = mChatRoom.getParticipants()[0].getAddress();
 		}
 
-		mIsReadOnly = mChatRoom.getState() == ChatRoom.State.Terminated;
 		getContactsForParticipants();
 	}
 
@@ -408,7 +406,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			}
 		}
 
-		if (mIsReadOnly) {
+		if (mChatRoom.isReadOnly()) {
 			setReadOnly();
 		}
 	}
@@ -681,8 +679,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	@Override
 	public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
-		mIsReadOnly = mChatRoom.getState() == ChatRoom.State.Terminated;
-		if (mIsReadOnly) {
+		if (mChatRoom.isReadOnly()) {
 			setReadOnly();
 		}
 	}
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index 72afa0751..a452a9af4 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -94,7 +94,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
 		mIsEditionEnabled = getArguments().getBoolean("isEditionEnabled");
 		mSubject = getArguments().getString("subject");
 
-		if (mChatRoom != null && mChatRoom.getState() == ChatRoom.State.Terminated) {
+		if (mChatRoom != null && mChatRoom.isReadOnly()) {
 			mIsEditionEnabled = false;
 		}
 
@@ -138,7 +138,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
 				}
 			}
 		});
-		mLeaveGroupButton.setVisibility(mIsAlreadyCreatedGroup && mChatRoom.getState() != ChatRoom.State.Terminated ? View.VISIBLE : View.GONE);
+		mLeaveGroupButton.setVisibility(mIsAlreadyCreatedGroup && mChatRoom.isReadOnly() ? View.GONE : View.VISIBLE);
 
 		mAddParticipantsButton = view.findViewById(R.id.addParticipants);
 		mAddParticipantsButton.setOnClickListener(new View.OnClickListener() {
diff --git a/submodules/linphone b/submodules/linphone
index 7e48b9c95..397dbc39f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 7e48b9c95649a2baf825106665c8bf7870f72abd
+Subproject commit 397dbc39fbc3f9ce82070f916e52e7f261c058da