Эх сурвалжийг харах

Move XMPPMUCLight into XMPPController

Sergey 2 жил өмнө
parent
commit
a80901e65f

+ 7 - 3
Chat/Main/XMPPController.swift

@@ -15,21 +15,25 @@ final class XMPPController: NSObject {
 	let xmppReconnect: XMPPReconnect
 	let xmppRoster: XMPPRoster
 	let xmppRosterStorage: XMPPRosterMemoryStorage
+	let xmppMUCLight: XMPPMUCLight
 
 	var xmppAuth: XMPPPlainAuthentication
 
 	private override init() {
 		self.xmppStream = XMPPStream()
 
+		self.xmppReconnect = XMPPReconnect()
+
 		self.xmppRosterStorage = XMPPRosterMemoryStorage()
 		self.xmppRoster = XMPPRoster(rosterStorage: xmppRosterStorage)
 
-		self.xmppReconnect = XMPPReconnect()
+		self.xmppMUCLight = XMPPMUCLight()
+
+		self.xmppAuth = XMPPPlainAuthentication()
 
 		self.xmppReconnect.activate(xmppStream)
 		self.xmppRoster.activate(xmppStream)
-
-		self.xmppAuth = XMPPPlainAuthentication()
+		self.xmppMUCLight.activate(xmppStream)
 
 		super.init()
 

+ 2 - 6
Chat/UI/Rooms/RoomsListViewModel.swift

@@ -10,19 +10,15 @@ import XMPPFramework
 import XMPPFrameworkSwift
 
 final class RoomsListViewModel: NSObject, ObservableObject {
-	let muc: XMPPMUCLight = XMPPMUCLight()
-
 	@Published var rooms: [Room] = []
 
 	override init() {
 		super.init()
-		self.muc.activate(XMPPController.shared.xmppStream)
-		self.muc.addDelegate(self, delegateQueue: .main)
+		XMPPController.shared.xmppMUCLight.addDelegate(self, delegateQueue: .main)
 	}
 
 	func fetchRooms() {
-		let success = self.muc.discoverRooms(forServiceNamed: "chat.msg.sharix-app.org")
-		print(success)
+		_ = XMPPController.shared.xmppMUCLight.discoverRooms(forServiceNamed: "chat.msg.sharix-app.org")
 	}
 }