From 1a1901261348a74f07026055aa2a3420033136dc Mon Sep 17 00:00:00 2001
From: Benoit Martins <benoit.martins@belledonne-communications.com>
Date: Mon, 25 Aug 2025 16:04:37 +0200
Subject: [PATCH] Use the disableChatFeature variable from SharedMainViewModel
 instead of CorePreference

---
 Linphone/UI/Main/ContentView.swift                  | 12 ++++++------
 .../UI/Main/Viewmodel/SharedMainViewModel.swift     | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Linphone/UI/Main/ContentView.swift b/Linphone/UI/Main/ContentView.swift
index 5b49be882..b2ab6caf6 100644
--- a/Linphone/UI/Main/ContentView.swift
+++ b/Linphone/UI/Main/ContentView.swift
@@ -298,7 +298,7 @@ struct ContentView: View {
 										}
 										.frame(height: geometry.size.height/4)
 										
-                                        if !CorePreferences.disableChatFeature {
+                                        if !sharedMainViewModel.disableChatFeature {
                                             ZStack {
                                                 if SharedMainViewModel.shared.unreadMessages > 0 {
                                                     VStack {
@@ -845,7 +845,7 @@ struct ContentView: View {
 										.frame(width: 66)
 									}
                                     
-                                    if !CorePreferences.disableChatFeature {
+                                    if !sharedMainViewModel.disableChatFeature {
                                         Spacer()
                                     
                                         ZStack {
@@ -1181,7 +1181,7 @@ struct ContentView: View {
 							.onDisappear {
 								if let contactsListVM = contactsListViewModel, let displayedConversation = contactsListVM.displayedConversation {
                                     
-                                    if !CorePreferences.disableChatFeature {
+                                    if !sharedMainViewModel.disableChatFeature {
                                         sharedMainViewModel.displayedFriend = nil
                                         sharedMainViewModel.displayedCall = nil
                                         sharedMainViewModel.changeIndexView(indexViewInt: 2)
@@ -1206,7 +1206,7 @@ struct ContentView: View {
                                     }
 								} else if let historyListVM = historyListViewModel, let displayedConversation = historyListVM.displayedConversation {
                                     
-                                    if !CorePreferences.disableChatFeature {
+                                    if !sharedMainViewModel.disableChatFeature {
                                         sharedMainViewModel.displayedFriend = nil
                                         sharedMainViewModel.displayedCall = nil
                                         sharedMainViewModel.changeIndexView(indexViewInt: 2)
@@ -1276,7 +1276,7 @@ struct ContentView: View {
 					if  let meetingsListVM = meetingsListViewModel, isShowSendCancelMeetingNotificationPopup {
 						PopupView(isShowPopup: $isShowSendCancelMeetingNotificationPopup,
 								  title: Text("meeting_schedule_cancel_dialog_title"),
-                                  content: !CorePreferences.disableChatFeature ? Text("meeting_schedule_cancel_dialog_message") : Text(""),
+                                  content: !sharedMainViewModel.disableChatFeature ? Text("meeting_schedule_cancel_dialog_message") : Text(""),
 								  titleFirstButton: Text("dialog_cancel"),
 								  actionFirstButton: {
 							sharedMainViewModel.displayedMeeting = nil
@@ -1382,7 +1382,7 @@ struct ContentView: View {
 			}
 			.onChange(of: navigationManager.selectedCallId) { newCallId in
 				if newCallId != nil {
-                    if !CorePreferences.disableChatFeature {
+                    if !sharedMainViewModel.disableChatFeature {
                         sharedMainViewModel.changeIndexView(indexViewInt: 2)
                     }
 				}
diff --git a/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift b/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift
index 9e28d345a..c70e3ebf1 100644
--- a/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift
+++ b/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift
@@ -46,6 +46,8 @@ class SharedMainViewModel: ObservableObject {
     @Published var unreadMessages: Int = 0
     @Published var missedCallsCount: Int = 0
 	
+	@Published var disableChatFeature: Bool = false
+	
 	let welcomeViewKey = "welcome_view"
 	let generalTermsKey = "general_terms"
 	let displayProfileModeKey = "display_profile_mode"
@@ -91,6 +93,7 @@ class SharedMainViewModel: ObservableObject {
         
         updateMissedCallsCount()
         updateUnreadMessagesCount()
+		updateDisableChatFeature()
 	}
 	
 	func changeWelcomeView() {
@@ -211,4 +214,14 @@ class SharedMainViewModel: ObservableObject {
             }
         }
     }
+	
+	func updateDisableChatFeature() {
+		CoreContext.shared.doOnCoreQueue { core in
+			let disableChatFeatureTmp = CorePreferences.disableChatFeature
+			
+			DispatchQueue.main.async {
+				self.disableChatFeature = disableChatFeatureTmp
+			}
+		}
+	}
 }