From 8f8949cb3e2a0221de7edae7677cac633ee7743a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 9 May 2022 14:05:03 +0200
Subject: [PATCH] Fixed first to join snack displayed multiple times + prevent
 first admin snack when going to participants list + show admin snack for
 conference.me as well

---
 app/src/main/assets/linphonerc_factory        |  1 +
 .../voip/fragments/ConferenceCallFragment.kt  | 20 +++++++++++--------
 .../ConferenceParticipantsFragment.kt         | 14 ++++++++++++-
 .../voip/viewmodels/ConferenceViewModel.kt    | 10 +++++++++-
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/app/src/main/assets/linphonerc_factory b/app/src/main/assets/linphonerc_factory
index b5c6025bc..c400cd45f 100644
--- a/app/src/main/assets/linphonerc_factory
+++ b/app/src/main/assets/linphonerc_factory
@@ -23,6 +23,7 @@ ec_calibrator_cool_tones=1
 [video]
 displaytype=MSAndroidTextureDisplay
 auto_resize_preview_to_keep_ratio=1
+max_mosaic_size=vga
 
 [misc]
 enable_basic_to_client_group_chat_room_migration=0
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
index 15fbb90a1..f9c17860c 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
@@ -139,19 +139,23 @@ class ConferenceCallFragment : GenericFragment<VoipConferenceCallFragmentBinding
         conferenceViewModel.firstToJoinEvent.observe(
             viewLifecycleOwner
         ) {
-            Snackbar
-                .make(binding.coordinator, R.string.conference_first_to_join, Snackbar.LENGTH_LONG)
-                .setAnchorView(binding.primaryButtons.hangup)
-                .show()
+            it.consume {
+                Snackbar
+                    .make(binding.coordinator, R.string.conference_first_to_join, Snackbar.LENGTH_LONG)
+                    .setAnchorView(binding.primaryButtons.hangup)
+                    .show()
+            }
         }
 
         conferenceViewModel.allParticipantsLeftEvent.observe(
             viewLifecycleOwner
         ) {
-            Snackbar
-                .make(binding.coordinator, R.string.conference_last_user, Snackbar.LENGTH_LONG)
-                .setAnchorView(binding.primaryButtons.hangup)
-                .show()
+            it.consume {
+                Snackbar
+                    .make(binding.coordinator, R.string.conference_last_user, Snackbar.LENGTH_LONG)
+                    .setAnchorView(binding.primaryButtons.hangup)
+                    .show()
+            }
         }
 
         controlsViewModel.goToConferenceParticipantsListEvent.observe(
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceParticipantsFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceParticipantsFragment.kt
index f0664a36a..00353f16d 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceParticipantsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceParticipantsFragment.kt
@@ -33,6 +33,9 @@ import org.linphone.databinding.VoipConferenceParticipantsFragmentBinding
 class ConferenceParticipantsFragment : GenericFragment<VoipConferenceParticipantsFragmentBinding>() {
     private val conferenceViewModel: ConferenceViewModel by navGraphViewModels(R.id.call_nav_graph)
 
+    // Only display events happening during while this fragment is visible
+    private var skipEvents = true
+
     override fun getLayoutId(): Int = R.layout.voip_conference_participants_fragment
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -62,7 +65,9 @@ class ConferenceParticipantsFragment : GenericFragment<VoipConferenceParticipant
                 } else {
                     getString(R.string.conference_admin_unset).format(participantName)
                 }
-                Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+                if (!skipEvents) {
+                    Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+                }
             }
         }
 
@@ -78,6 +83,13 @@ class ConferenceParticipantsFragment : GenericFragment<VoipConferenceParticipant
     override fun onResume() {
         super.onResume()
 
+        skipEvents = false
         coreContext.core.nativePreviewWindowId = binding.localPreviewVideoSurface
     }
+
+    override fun onPause() {
+        super.onPause()
+
+        skipEvents = true
+    }
 }
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
index 18280929d..f70faf638 100644
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
@@ -106,9 +106,17 @@ class ConferenceViewModel : ViewModel() {
             conference: Conference,
             participant: Participant
         ) {
-            Log.i("[Conference] Participant admin status changed")
+            Log.i("[Conference] Participant admin status changed [${participant.address.asStringUriOnly()}] is ${if (participant.isAdmin) "now admin" else "no longer admin"}")
             isMeAdmin.value = conference.me.isAdmin
             updateParticipantsList(conference)
+
+            if (conference.me.address.weakEqual(participant.address)) {
+                Log.i("[Conference] Found me participant [${participant.address.asStringUriOnly()}]")
+                val participantData = ConferenceParticipantData(conference, participant)
+                participantAdminStatusChangedEvent.value = Event(participantData)
+                return
+            }
+
             val participantData = conferenceParticipants.value.orEmpty().find { data -> data.participant.address.weakEqual(participant.address) }
             if (participantData != null) {
                 participantAdminStatusChangedEvent.value = Event(participantData)