Fix rebase

Linphone.xcodeproj/project.pbxproj

@@ -29,6 +29,8 @@
 		D72343362AD037AF009AA24E /* ToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72343352AD037AF009AA24E /* ToastView.swift */; };
 		D72992392ADD7F68003AF125 /* HistoryContactFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72992382ADD7F68003AF125 /* HistoryContactFragment.swift */; };
 		D732A9092AFD235500DB42BA /* ShareSheetController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D732A9082AFD235500DB42BA /* ShareSheetController.swift */; };
+		D732A90C2B0376F500DB42BA /* linphonerc-default in Resources */ = {isa = PBXBuildFile; fileRef = D732A90A2B0376F500DB42BA /* linphonerc-default */; };
+		D732A90D2B0376F500DB42BA /* linphonerc-factory in Resources */ = {isa = PBXBuildFile; fileRef = D732A90B2B0376F500DB42BA /* linphonerc-factory */; };
 		D732A90F2B04C3B400DB42BA /* HistoryFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D732A90E2B04C3B400DB42BA /* HistoryFragment.swift */; };
 		D732A9132B04C7A300DB42BA /* HistoryListFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D732A9122B04C7A300DB42BA /* HistoryListFragment.swift */; };
 		D732A9152B04C7FE00DB42BA /* HistoryListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D732A9142B04C7FE00DB42BA /* HistoryListViewModel.swift */; };
@@ -51,6 +53,7 @@
 		D7A03FC02ACC2E390081A588 /* HistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A03FBF2ACC2E390081A588 /* HistoryView.swift */; };
 		D7A03FC62ACC458A0081A588 /* SplashScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A03FC52ACC458A0081A588 /* SplashScreen.swift */; };
 		D7A2EDD62AC18115005D90FC /* SharedMainViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A2EDD52AC18115005D90FC /* SharedMainViewModel.swift */; };
+		D7ADF6002AFE356400212231 /* Avatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7ADF5FF2AFE356400212231 /* Avatar.swift */; };
 		D7B5066D2AEFA9B900CEB4E9 /* ContactInnerFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7B5066C2AEFA9B900CEB4E9 /* ContactInnerFragment.swift */; };
 		D7C365082AEFAB7F00FE6142 /* ContactListBottomSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C365072AEFAB7F00FE6142 /* ContactListBottomSheet.swift */; };
 		D7C3650A2AF001C300FE6142 /* EditContactFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C365092AF001C300FE6142 /* EditContactFragment.swift */; };
@@ -101,6 +104,8 @@
 		D72343352AD037AF009AA24E /* ToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastView.swift; sourceTree = "<group>"; };
 		D72992382ADD7F68003AF125 /* HistoryContactFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryContactFragment.swift; sourceTree = "<group>"; };
 		D732A9082AFD235500DB42BA /* ShareSheetController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareSheetController.swift; sourceTree = "<group>"; };
+		D732A90A2B0376F500DB42BA /* linphonerc-default */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-default"; sourceTree = "<group>"; };
+		D732A90B2B0376F500DB42BA /* linphonerc-factory */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-factory"; sourceTree = "<group>"; };
 		D732A90E2B04C3B400DB42BA /* HistoryFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryFragment.swift; sourceTree = "<group>"; };
 		D732A9122B04C7A300DB42BA /* HistoryListFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryListFragment.swift; sourceTree = "<group>"; };
 		D732A9142B04C7FE00DB42BA /* HistoryListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryListViewModel.swift; sourceTree = "<group>"; };
@@ -124,6 +129,7 @@
 		D7A03FC52ACC458A0081A588 /* SplashScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SplashScreen.swift; sourceTree = "<group>"; };
 		D7A2EDD52AC18115005D90FC /* SharedMainViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedMainViewModel.swift; sourceTree = "<group>"; };
 		D7A2EDDA2AC19EEC005D90FC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+		D7ADF5FF2AFE356400212231 /* Avatar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Avatar.swift; sourceTree = "<group>"; };
 		D7B5066C2AEFA9B900CEB4E9 /* ContactInnerFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactInnerFragment.swift; sourceTree = "<group>"; };
 		D7C365072AEFAB7F00FE6142 /* ContactListBottomSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListBottomSheet.swift; sourceTree = "<group>"; };
 		D7C365092AF001C300FE6142 /* EditContactFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditContactFragment.swift; sourceTree = "<group>"; };
@@ -178,6 +184,7 @@
 				D7C3650D2AF15BF200FE6142 /* PhotoPicker.swift */,
 				D7C48DF32AFA66F900D938CB /* EditContactController.swift */,
 				D732A9082AFD235500DB42BA /* ShareSheetController.swift */,
+				D7ADF5FF2AFE356400212231 /* Avatar.swift */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -214,6 +221,7 @@
 				D70C93DD2AC2D0F60063CA3B /* Localizable.xcstrings */,
 				D719ABBD2ABC67BF00B41C10 /* Preview Content */,
 				D7D24D0C2AC1B4C700C6F35B /* Fonts */,
+				D7ADF6012AFE5C7C00212231 /* Ressources */,
 			);
 			path = Linphone;
 			sourceTree = "<group>";
@@ -393,6 +401,15 @@
 			path = Viewmodel;
 			sourceTree = "<group>";
 		};
+		D7ADF6012AFE5C7C00212231 /* Ressources */ = {
+			isa = PBXGroup;
+			children = (
+				D732A90A2B0376F500DB42BA /* linphonerc-default */,
+				D732A90B2B0376F500DB42BA /* linphonerc-factory */,
+			);
+			path = Ressources;
+			sourceTree = "<group>";
+		};
 		D7D24D0C2AC1B4C700C6F35B /* Fonts */ = {
 			isa = PBXGroup;
 			children = (
@@ -487,6 +504,8 @@
 				D719ABBF2ABC67BF00B41C10 /* Preview Assets.xcassets in Resources */,
 				D719ABBB2ABC67BF00B41C10 /* Assets.xcassets in Resources */,
 				D7D24D132AC1B4E800C6F35B /* NotoSans-Medium.ttf in Resources */,
+				D732A90C2B0376F500DB42BA /* linphonerc-default in Resources */,
+				D732A90D2B0376F500DB42BA /* linphonerc-factory in Resources */,
 				D70C93DE2AC2D0F60063CA3B /* Localizable.xcstrings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -521,6 +540,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D7C3650E2AF15BF200FE6142 /* PhotoPicker.swift in Sources */,
+				D7ADF6002AFE356400212231 /* Avatar.swift in Sources */,
 				D71707202AC5989C0037746F /* TextExtension.swift in Sources */,
 				D719ABB92ABC67BF00B41C10 /* ContentView.swift in Sources */,
 				D71FCA832AE14D6E00D2E43E /* ContactFragment.swift in Sources */,

Linphone/Assets.xcassets/presence-busy.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "presence-busy.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Linphone/Assets.xcassets/presence-busy.imageset/presence-busy.svg

@@ -0,0 +1,5 @@
+<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Pastille de pr&#195;&#169;sence">
+<circle id="Ellipse 2" cx="11.7222" cy="11.8889" r="10.1111" fill="#DBB820" stroke="white" stroke-width="2"/>
+</g>
+</svg>

Linphone/Assets.xcassets/presence-online.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "presence-online.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Linphone/Assets.xcassets/presence-online.imageset/presence-online.svg

@@ -0,0 +1,5 @@
+<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Pastille de pr&#195;&#169;sence">
+<circle id="Ellipse 2" cx="11.7224" cy="11.8889" r="10.1111" fill="#4FAE80" stroke="white" stroke-width="2"/>
+</g>
+</svg>

Linphone/Contacts/ContactsManager.swift

@@ -173,7 +173,7 @@ final class ContactsManager {
 			self.saveFriend(result: result, contact: contact, existingFriend: existingFriend) { resultFriend in
 				if resultFriend != nil {
 					if linphoneFriend && existingFriend == nil {
-						_ = self.linphoneFriendList?.addLocalFriend(linphoneFriend: resultFriend!)
+						_ = self.linphoneFriendList?.addFriend(linphoneFriend: resultFriend!)
 						self.linphoneFriendList?.updateSubscriptions()
 					} else if existingFriend == nil {
 						_ = self.friendList?.addLocalFriend(linphoneFriend: resultFriend!)

Linphone/Core/CoreContext.swift

@@ -30,11 +30,18 @@ final class CoreContext: ObservableObject {
 	@Published var loggedIn: Bool = false
 	@Published var loggingInProgress: Bool = false
 	@Published var defaultAccount: Account?
+	@Published var coreIsStarted: Bool = false
 	
 	private var mCore: Core!
 	private var mIteratePublisher: AnyCancellable?
 	
-	private init() {}
+	private init() {
+		do {
+			try initialiseCore()
+		} catch {
+			
+		}
+	}
 	
 	func doOnCoreQueue(synchronous: Bool = false, lambda: @escaping (Core) -> Void) {
 		if synchronous {
@@ -53,7 +60,26 @@ final class CoreContext: ObservableObject {
 		
 		coreQueue.async {
 			let configDir = Factory.Instance.getConfigDir(context: nil)
-			try? self.mCore = Factory.Instance.createCore(configPath: "\(configDir)/MyConfig", factoryConfigPath: "", systemContext: nil)
+            let url = NSURL(fileURLWithPath: configDir)
+            if let pathComponent = url.appendingPathComponent("linphonerc") {
+                let filePath = pathComponent.path
+                let fileManager = FileManager.default
+                if !fileManager.fileExists(atPath: filePath) {
+                    let path = Bundle.main.path(forResource: "linphonerc-default", ofType: nil)
+                    if path != nil {
+                        try? FileManager.default.copyItem(at: NSURL(fileURLWithPath: path!) as URL, to: pathComponent)
+                    }
+                }
+            }
+            
+            let config: Config! = Config.newForSharedCore(
+                appGroupId: "group.org.linphone.phone.msgNotification",
+                configFilename: "linphonerc",
+                factoryConfigFilename: Bundle.main.path(forResource: "linphonerc-factory", ofType: nil)
+            )
+            
+            self.mCore = try? Factory.Instance.createCoreWithConfig(config: config, systemContext: nil)
+
 			self.mCore.autoIterateEnabled = false
 			self.mCore.friendsDatabasePath = "\(configDir)/friends.db"
 			
@@ -89,6 +115,7 @@ final class CoreContext: ObservableObject {
 				if cbVal.state == .Ok {
 					self.loggingInProgress = false
 					self.loggedIn = true
+					self.coreIsStarted = true
 				} else if cbVal.state == .Progress {
 					self.loggingInProgress = true
 				} else {

Linphone/Linphone.entitlements

@@ -2,9 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.app-sandbox</key>
+	<key>com.apple.security.app-sandbox</key>
-    <true/>
+	<true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
+	<key>com.apple.security.application-groups</key>
-    <true/>
+	<array>
+		<string>group.belledonne-communications.linphone</string>
+		<string>group.org.linphone.phone.linphoneExtension</string>
+		<string>group.org.linphone.phone.msgNotification</string>
+	</array>
+	<key>com.apple.security.files.user-selected.read-only</key>
+	<true/>
 </dict>
 </plist>

Linphone/LinphoneApp.swift

@@ -30,11 +30,11 @@ struct LinphoneApp: App {
 	@State private var historyViewModel: HistoryViewModel?
 	@State private var historyListViewModel: HistoryListViewModel?
 	
-	@State private var isActive = false
+	@State private var isActive = true
 	
 	var body: some Scene {
 		WindowGroup {
-			if isActive {
+			if isActive && coreContext.coreIsStarted {
 				if !sharedMainViewModel.welcomeViewDisplayed {
 					WelcomeView()
 				} else if coreContext.defaultAccount == nil || sharedMainViewModel.displayProfileMode {

Linphone/Ressources/linphonerc-default

@@ -0,0 +1,39 @@
+
+## Start of default rc
+
+[sip]
+contact="Linphone iPhone" <sip:linphone.iphone@unknown-host>
+use_info=0
+use_ipv6=1
+keepalive_period=30000
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+media_encryption=none
+update_presence_model_timestamp_before_publish_expires_refresh=1
+
+[net]
+#Because dynamic bitrate adaption can increase bitrate, we must allow "no limit"
+download_bw=0
+upload_bw=0
+
+[video]
+size=vga
+
+[app]
+tunnel=disabled
+auto_start=1
+record_aware=1
+
+[tunnel]
+host=
+port=443
+
+[misc]
+log_collection_upload_server_url=https://www.linphone.org:444/lft.php
+file_transfer_server_url=https://www.linphone.org:444/lft.php
+version_check_url_root=https://www.linphone.org/releases
+max_calls=10
+conference_layout=1
+
+## End of default rc

Linphone/Ressources/linphonerc-factory

@@ -0,0 +1,65 @@
+
+## Start of factory rc
+
+# This file shall not contain path referencing package name, in order to be portable when app is renamed.
+# Paths to resources must be set from LinphoneManager, after creating LinphoneCore.
+
+[net]
+mtu=1300
+force_ice_disablement=0
+
+[rtp]
+accept_any_encryption=1
+
+[sip]
+guess_hostname=1
+register_only_when_network_is_up=1
+auto_net_state_mon=1
+auto_answer_replacing_calls=1
+ping_with_options=0
+use_cpim=1
+zrtp_key_agreements_suites=MS_ZRTP_KEY_AGREEMENT_K255_KYB512
+chat_messages_aggregation_delay=1000
+chat_messages_aggregation=1
+update_presence_model_timestamp_before_publish_expires_refresh=1
+rls_uri=sips:rls@sip.linphone.org
+
+[sound]
+#remove this property for any application that is not Linphone public version itself
+ec_calibrator_cool_tones=1
+
+[video]
+displaytype=MSAndroidTextureDisplay
+auto_resize_preview_to_keep_ratio=1
+max_conference_size=vga
+
+[misc]
+enable_basic_to_client_group_chat_room_migration=0
+enable_simple_group_chat_message_state=0
+aggregate_imdn=1
+notify_each_friend_individually_when_presence_received=0
+store_friends=0
+
+[app]
+activation_code_length=4
+prefer_basic_chat_room=1
+record_aware=1
+
+[account_creator]
+backend=1
+# 1 means FlexiAPI, 0 is XMLRPC
+url=https://subscribe.linphone.org/api/
+# replace above URL by https://staging-subscribe.linphone.org/api/ for testing
+
+[lime]
+lime_update_threshold=86400
+
+[alerts]
+alerts_enabled=1
+
+[assistant]
+algorithm=SHA-256
+password_min_length=6
+username_regex=^[a-z0-9+_.\-]*$
+
+## End of factory rc

Linphone/SplashScreen.swift

@@ -38,14 +38,6 @@ struct SplashScreen: View {
 			
 		}
 		.ignoresSafeArea(.all)
-		.onAppear {
-			Task {
-				try coreContext.initialiseCore()
-				withAnimation {
-					self.isActive = true
-				}
-			}
-		}
 	}
 }
 

Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift

@@ -113,28 +113,7 @@ struct ContactInnerFragment: View {
 									&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
 									&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.photo != nil
 									&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.photo!.isEmpty {
-									AsyncImage(
+                                    Avatar(friend: magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!, avatarSize: 100)
-										url: ContactsManager.shared.getImagePath(
-										friendPhotoPath: magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.photo!)) { image in
-										switch image {
-										case .empty:
-											ProgressView()
-												.frame(width: 100, height: 100)
-										case .success(let image):
-											image
-												.resizable()
-												.aspectRatio(contentMode: .fill)
-												.frame(width: 100, height: 100)
-												.clipShape(Circle())
-										case .failure:
-											Image("profil-picture-default")
-												.resizable()
-												.frame(width: 100, height: 100)
-												.clipShape(Circle())
-										@unknown default:
-											EmptyView()
-										}
-									}
 								} else if contactViewModel.indexDisplayedFriend != nil && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil {
 									Image("profil-picture-default")
 										.resizable()

Linphone/UI/Main/Contacts/Fragments/ContactsListFragment.swift

@@ -64,26 +64,7 @@ struct ContactsListFragment: View {
                             }
                             
                             if magicSearch.lastSearch[index].friend!.photo != nil && !magicSearch.lastSearch[index].friend!.photo!.isEmpty {
-								AsyncImage(url: ContactsManager.shared.getImagePath(friendPhotoPath: magicSearch.lastSearch[index].friend!.photo!)) { image in
+                                Avatar(friend: magicSearch.lastSearch[index].friend!, avatarSize: 45)
-                                    switch image {
-                                    case .empty:
-                                        ProgressView()
-                                            .frame(width: 45, height: 45)
-                                    case .success(let image):
-                                        image
-                                            .resizable()
-											.aspectRatio(contentMode: .fill)
-                                            .frame(width: 45, height: 45)
-                                            .clipShape(Circle())
-                                    case .failure:
-                                        Image("profil-picture-default")
-                                            .resizable()
-                                            .frame(width: 45, height: 45)
-                                            .clipShape(Circle())
-                                    @unknown default:
-                                        EmptyView()
-                                    }
-                                }
                             } else {
                                 Image("profil-picture-default")
                                     .resizable()

Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift

@@ -129,26 +129,7 @@ struct EditContactFragment: View {
 								if editContactViewModel.selectedEditFriend != nil
 									&& editContactViewModel.selectedEditFriend!.photo != nil
 									&& !editContactViewModel.selectedEditFriend!.photo!.isEmpty && selectedImage == nil && !removedImage {
-									AsyncImage(url: ContactsManager.shared.getImagePath(friendPhotoPath: editContactViewModel.selectedEditFriend!.photo!)) { image in
+                                    Avatar(friend: editContactViewModel.selectedEditFriend!, avatarSize: 100)
-										switch image {
-										case .empty:
-											ProgressView()
-												.frame(width: 100, height: 100)
-										case .success(let image):
-											image
-												.resizable()
-												.aspectRatio(contentMode: .fill)
-												.frame(width: 100, height: 100)
-												.clipShape(Circle())
-										case .failure:
-											Image("profil-picture-default")
-												.resizable()
-												.frame(width: 100, height: 100)
-												.clipShape(Circle())
-										@unknown default:
-											EmptyView()
-										}
-									}
 								} else if selectedImage == nil {
 									Image("profil-picture-default")
 										.resizable()

Linphone/UI/Main/Contacts/Fragments/FavoriteContactsListFragment.swift

@@ -39,27 +39,7 @@ struct FavoriteContactsListFragment: View {
 							VStack {
 								if magicSearch.lastSearch[index].friend!.photo != nil
 									&& !magicSearch.lastSearch[index].friend!.photo!.isEmpty {
-									AsyncImage(url: ContactsManager.shared.getImagePath(friendPhotoPath: magicSearch.lastSearch[index].friend!.photo!)
+                                    Avatar(friend: magicSearch.lastSearch[index].friend!, avatarSize: 45)
-									) { image in
-										switch image {
-										case .empty:
-											ProgressView()
-												.frame(width: 45, height: 45)
-										case .success(let image):
-											image
-												.resizable()
-												.aspectRatio(contentMode: .fill)
-												.frame(width: 45, height: 45)
-												.clipShape(Circle())
-										case .failure:
-											Image("profil-picture-default")
-												.resizable()
-												.frame(width: 45, height: 45)
-												.clipShape(Circle())
-										@unknown default:
-											EmptyView()
-										}
-									}
 								} else {
 									Image("profil-picture-default")
 										.resizable()

Linphone/Utils/Avatar.swift

@@ -83,8 +83,10 @@ struct Avatar: View {
     }
     
     func addDelegate() {
+        print("onPresenceReceivedonPresenceReceived \(friend.name) \(friend.consolidatedPresence)")
         let newFriendDelegate = FriendDelegateStub(
             onPresenceReceived: { (linphoneFriend: Friend) -> Void in
+                print("onPresenceReceivedonPresenceReceived delegate \(friend.name) \(friend.consolidatedPresence) \(linphoneFriend.consolidatedPresence)")
 				self.presenceImage = linphoneFriend.consolidatedPresence == ConsolidatedPresence.Online ? "presence-online" : "presence-busy"
             }
         )