From 46d25ce4a9aad5eb1695036cfd789e6b8cfcc2ce Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 24 Jun 2021 16:52:11 +0200
Subject: [PATCH] Fixed lost subject when creating a group chat room and
 navigating back to add more participants

---
 .../activities/main/chat/fragments/GroupInfoFragment.kt     | 6 ++++++
 .../activities/main/viewmodels/SharedMainViewModel.kt       | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt
index f179a6b9f..dc9a50180 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt
@@ -133,6 +133,7 @@ class GroupInfoFragment : SecureFragment<ChatRoomGroupInfoFragmentBinding>() {
                 list.add(participant.participant.address)
             }
             sharedViewModel.chatRoomParticipants.value = list
+            sharedViewModel.chatRoomSubject = viewModel.subject.value.orEmpty()
 
             val args = Bundle()
             args.putBoolean("createGroup", true)
@@ -183,6 +184,11 @@ class GroupInfoFragment : SecureFragment<ChatRoomGroupInfoFragmentBinding>() {
 
             viewModel.participants.value = list
         }
+
+        if (sharedViewModel.chatRoomSubject.isNotEmpty()) {
+            viewModel.subject.value = sharedViewModel.chatRoomSubject
+            sharedViewModel.chatRoomSubject = ""
+        }
     }
 
     private fun showMeAdminStateChanged(isMeAdmin: Boolean) {
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
index fd41f18a3..e68162ca4 100644
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
@@ -54,6 +54,8 @@ class SharedMainViewModel : ViewModel() {
 
     val chatRoomParticipants = MutableLiveData<ArrayList<Address>>()
 
+    var chatRoomSubject: String = ""
+
     /* Contacts */
 
     val selectedContact = MutableLiveData<Contact>()