Get account directly from MLContact

monal-im · Aug 6, 2024 · f005b29 · f005b29
1 parent cdde23c
commit f005b29
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 28 deletions.
diff --git a/Monal/Classes/ChannelMemberList.swift b/Monal/Classes/ChannelMemberList.swift
@@ -15,7 +15,7 @@ struct ChannelMemberList: View {
     @State private var participants: OrderedDictionary<String, String>
 
     init(mucContact: ObservableKVOWrapper<MLContact>) {
-        account = MLXMPPManager.sharedInstance().getConnectedAccount(forID: mucContact.accountId)! as xmpp
+        account = mucContact.obj.account! as xmpp
         _channel = StateObject(wrappedValue:mucContact)
         _ownAffiliation = State(wrappedValue:"none")
         _participants = State(wrappedValue:OrderedDictionary<String, String>())

diff --git a/Monal/Classes/ContactDetails.swift b/Monal/Classes/ContactDetails.swift
@@ -35,7 +35,7 @@ struct ContactDetails: View {
     init(delegate: SheetDismisserProtocol, contact: ObservableKVOWrapper<MLContact>) {
         self.delegate = delegate
         _contact = StateObject(wrappedValue: contact)
-        self.account = MLXMPPManager.sharedInstance().getConnectedAccount(forID: contact.accountId)!
+        self.account = contact.obj.account!
     }
 
     private func updateRoleAndAffiliation() {

diff --git a/Monal/Classes/EditGroupSubject.swift b/Monal/Classes/EditGroupSubject.swift
@@ -19,7 +19,7 @@ struct EditGroupSubject: View {
 
         _subject = State(wrappedValue: contact.obj.groupSubject)
         _contact = StateObject(wrappedValue: contact)
-        self.account = MLXMPPManager.sharedInstance().getConnectedAccount(forID: contact.accountId)! as xmpp
+        self.account = contact.obj.account! as xmpp
     }
 
     var body: some View {

diff --git a/Monal/Classes/MLCall.m b/Monal/Classes/MLCall.m
@@ -288,7 +288,7 @@ +(NSSet*) keyPathsForValuesAffectingState
 -(xmpp*) account
 {
     @synchronized(self) {
-        xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.contact.accountId];
+        xmpp* account = self.contact.account;
         MLAssert(account != nil, @"Account of call must be listed in MLXMPPManager connected accounts!", (@{
             @"contact": nilWrapper(self.contact),
             @"call": nilWrapper(self),
@@ -1274,7 +1274,7 @@ -(void) processIncomingICECandidate:(NSNotification*) notification
     if(account != [[MLXMPPManager sharedInstance] getConnectedAccountForID:account.accountNo])
         return;
     //don't use self.account because that asserts on nil
-    if([[MLXMPPManager sharedInstance] getConnectedAccountForID:self.contact.accountId] == nil)
+    if(self.contact.account == nil)
         return;
 
     XMPPIQ* iqNode = userInfo[@"iqNode"];
@@ -1413,7 +1413,7 @@ -(void) processIncomingSDP:(NSNotification*) notification
     if(account != [[MLXMPPManager sharedInstance] getConnectedAccountForID:account.accountNo])
         return;
     //don't use self.account because that asserts on nil
-    if([[MLXMPPManager sharedInstance] getConnectedAccountForID:self.contact.accountId] == nil)
+    if(self.contact.account == nil)
         return;
     XMPPIQ* iqNode = userInfo[@"iqNode"];
 

diff --git a/Monal/Classes/MLContact.m b/Monal/Classes/MLContact.m
@@ -377,7 +377,7 @@ -(NSString*) contactDisplayNameWithFallback:(NSString* _Nullable) fallbackName a
     }
     else
     {
-        xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.accountId];
+        xmpp* account = self.account;
         if(hasSelfnotesPrefix)
         {
             //add "Note to self: " prefix for selfchats
@@ -436,7 +436,7 @@ -(void) setNickNameView:(NSString*) name
         _cancelNickChange();
     // delay changes because we don't want to update the roster on our server too often while typing
     _cancelNickChange = createTimer(2.0, (^{
-        xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.accountId];
+        xmpp* account = self.account;
         [account updateRosterItem:self withName:self.nickName];
     }));
 }
@@ -457,7 +457,7 @@ -(void) setFullNameView:(NSString*) name
     if([self.fullName isEqualToString:name] || name == nil)
         return;             //no change at all
     self.fullName = name;
-    xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.accountId];
+    xmpp* account = self.account;
     [[DataLayer sharedInstance] setFullName:self.fullName forContact:self.contactJid andAccount:account.accountNo];
     // abort old change timer and start a new one
     if(_cancelFullNameChange)
@@ -498,7 +498,7 @@ -(BOOL) hasAvatar
 
 -(BOOL) isSelfChat
 {
-    xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.accountId];
+    xmpp* account = self.account;
     return [self.contactJid isEqualToString:account.connectionProperties.identity.jid];
 }
 
@@ -625,7 +625,7 @@ -(BOOL) toggleEncryption:(BOOL) encrypt
 #ifdef DISABLE_OMEMO
     return NO;
 #else
-    xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.accountId];
+    xmpp* account = self.account;
     if(account == nil || account.omemo == nil)
         return NO;
     if(self.isGroup == NO)
@@ -664,7 +664,7 @@ -(void) togglePinnedChat:(BOOL) pinned
         [[DataLayer sharedInstance] unPinChat:self.accountId andBuddyJid:self.contactJid];
     self.isPinned = pinned;
     // update active chats
-    xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.accountId];
+    xmpp* account = self.account;
     if(account == nil)
         return;
     [[MLNotificationQueue currentQueue] postNotificationName:kMonalContactRefresh object:account userInfo:@{@"contact":self, @"pinningChanged": @YES}];
@@ -674,7 +674,7 @@ -(BOOL) toggleBlocked:(BOOL) block
 {
     if(self.isBlocked == block)
         return YES;
-    xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.accountId];
+    xmpp* account = self.account;
     if(account == nil)
         return NO;
     if(![account.connectionProperties.serverDiscoFeatures containsObject:@"urn:xmpp:blocking"])

diff --git a/Monal/Classes/MLImageManager.m b/Monal/Classes/MLImageManager.m
@@ -181,7 +181,7 @@ -(UIImage*) generateDummyIconForContact:(MLContact*) contact
 
     if(contact.isSelfChat)
     {
-        xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:contact.accountId];
+        xmpp* account = contact.account;
         contactLetter = [[[MLContact ownDisplayNameForAccount:account] substringToIndex:1] uppercaseString];
     }
     else

diff --git a/Monal/Classes/MLVoIPProcessor.m b/Monal/Classes/MLVoIPProcessor.m
@@ -165,7 +165,7 @@ -(MLCall* _Nullable) getCallForJmiid:(NSString*) jmiid
 
 -(MLCall*) initiateCallWithType:(MLCallType) callType toContact:(MLContact*) contact
 {
-    xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:contact.accountId];
+    xmpp* account = contact.account;
     MLAssert(account != nil, @"account is nil in initiateCallWithType:ToContact:!", (@{@"contact": contact}));
 
     NSUUID* uuid = [NSUUID UUID];

diff --git a/Monal/Classes/MLXMPPManager.m b/Monal/Classes/MLXMPPManager.m
@@ -647,7 +647,7 @@ -(NSString*) getPasswordForAccount:(NSNumber*) accountNo
 -(void) sendMessageAndAddToHistory:(NSString*) message havingType:(NSString*) messageType toContact:(MLContact*) contact isEncrypted:(BOOL) encrypted uploadInfo:(NSDictionary* _Nullable) uploadInfo withCompletionHandler:(void (^ _Nullable)(BOOL success, NSString* messageId)) completion
 {
     NSString* msgid = [[NSUUID UUID] UUIDString];
-    xmpp* account = [self getConnectedAccountForID:contact.accountId];
+    xmpp* account = contact.account;
 
     MLAssert(message != nil, @"Message should not be nil");
     MLAssert(account != nil, @"Account should not be nil");
@@ -689,7 +689,7 @@ -(void) sendMessageAndAddToHistory:(NSString*) message havingType:(NSString*) me
 -(void) sendMessage:(NSString*) message toContact:(MLContact*) contact isEncrypted:(BOOL) encrypted isUpload:(BOOL) isUpload messageId:(NSString*) messageId withCompletionHandler:(void (^ _Nullable)(BOOL success, NSString* messageId)) completion
 {
     BOOL success = NO;
-    xmpp* account = [self getConnectedAccountForID:contact.accountId];
+    xmpp* account = contact.account;
     if(account)
     {
         success = YES;
@@ -701,7 +701,7 @@ -(void) sendMessage:(NSString*) message toContact:(MLContact*) contact isEncrypt
 
 -(void) sendChatState:(BOOL) isTyping toContact:(MLContact*) contact
 {
-    xmpp* account = [self getConnectedAccountForID:contact.accountId];
+    xmpp* account = contact.account;
     if(account)
         [account sendChatState:isTyping toContact:contact];
 }
@@ -796,7 +796,7 @@ -(NSString*) getAccountNameForConnectedRow:(NSUInteger) row
 $$
 -(void) removeContact:(MLContact*) contact
 {
-    xmpp* account = [self getConnectedAccountForID:contact.accountId];
+    xmpp* account = contact.account;
     if(account)
     {
         //queue remove contact for execution once bound (e.g. on catchup done)
@@ -833,7 +833,7 @@ -(void) addContact:(MLContact*) contact
 $$
 -(void) addContact:(MLContact*) contact withPreauthToken:(NSString* _Nullable) preauthToken
 {
-    xmpp* account = [self getConnectedAccountForID:contact.accountId];
+    xmpp* account = contact.account;
     if(account)
     {
         //queue add contact for execution once bound (e.g. on catchup done)
@@ -864,7 +864,7 @@ -(void) addContact:(MLContact*) contact withPreauthToken:(NSString* _Nullable) p
 
 -(void) getEntitySoftWareVersionForContact:(MLContact*) contact andResource:(NSString*) resource
 {
-    xmpp* account = [self getConnectedAccountForID:contact.accountId];
+    xmpp* account = contact.account;
 
     NSString* xmppId = @"";
     if ((resource == nil) || ([resource length] == 0)) {
@@ -879,7 +879,7 @@ -(void) getEntitySoftWareVersionForContact:(MLContact*) contact andResource:(NSS
 -(void) block:(BOOL) isBlocked contact:(MLContact*) contact
 {
     DDLogVerbose(@"Blocking %@: %@", contact, bool2str(isBlocked));
-    xmpp* account = [self getConnectedAccountForID:contact.accountId];
+    xmpp* account = contact.account;
     [account setBlocked:isBlocked forJid:contact.contactJid];
 }
 

diff --git a/Monal/Classes/MemberList.swift b/Monal/Classes/MemberList.swift
@@ -30,7 +30,7 @@ struct MemberList: View {
     @StateObject private var overlay = LoadingOverlayState()
 
     init(mucContact: ObservableKVOWrapper<MLContact>) {
-        account = MLXMPPManager.sharedInstance().getConnectedAccount(forID: mucContact.accountId)! as xmpp
+        account = mucContact.obj.account! as xmpp
         _muc = StateObject(wrappedValue:mucContact)
         _ownAffiliation = State(wrappedValue:"none")
         _memberList = State(wrappedValue:OrderedSet<ObservableKVOWrapper<MLContact>>())

diff --git a/Monal/Classes/MonalAppDelegate.m b/Monal/Classes/MonalAppDelegate.m
@@ -879,7 +879,7 @@ -(void) userNotificationCenter:(UNUserNotificationCenter*) center didReceiveNoti
         MLAssert(fromContact, @"fromContact should not be nil");
         NSString* messageId = response.notification.request.content.userInfo[@"messageId"];
         MLAssert(messageId, @"messageId should not be nil");
-        xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:fromContact.accountId];
+        xmpp* account = fromContact.account;
         //this can happen if that account got disabled
         if(account == nil)
         {
@@ -954,7 +954,7 @@ -(void) userNotificationCenter:(UNUserNotificationCenter*) center didReceiveNoti
         DDLogVerbose(@"notification action '%@' triggered for %@", response.actionIdentifier, response.notification.request.content.userInfo);
         MLContact* fromContact = [MLContact createContactFromJid:response.notification.request.content.userInfo[@"fromContactJid"] andAccountNo:response.notification.request.content.userInfo[@"fromContactAccountId"]];
         MLAssert(fromContact, @"fromContact should not be nil");
-        xmpp* account = [[MLXMPPManager sharedInstance] getConnectedAccountForID:fromContact.accountId];
+        xmpp* account = fromContact.account;
         //this can happen if that account got disabled
         if(account == nil)
         {

diff --git a/Monal/Classes/OmemoKeys.swift b/Monal/Classes/OmemoKeys.swift
@@ -292,7 +292,7 @@ struct OmemoKeys: View {
         self.viewContact = contact
 
         if let contact = contact {
-            if let account = MLXMPPManager.sharedInstance().getConnectedAccount(forID: contact.accountId) {
+            if let account = contact.obj.account {
                 self.account = account
             }
         }

diff --git a/Monal/Classes/OmemoQrCodeView.swift b/Monal/Classes/OmemoQrCodeView.swift
@@ -30,7 +30,7 @@ struct OmemoQrCodeView: View {
     init(contact: ObservableKVOWrapper<MLContact>)
     {
         self.jid = contact.obj.contactJid
-        if let account = MLXMPPManager.sharedInstance().getConnectedAccount(forID: contact.obj.accountId) {
+        if let account = contact.obj.account {
             let devices = Array(account.omemo.knownDevices(forAddressName: self.jid))
             var keyList = ""
             var prefix = "?"

diff --git a/Monal/Classes/chatViewController.m b/Monal/Classes/chatViewController.m
@@ -803,7 +803,7 @@ -(void) viewWillAppear:(BOOL)animated
     self.viewIsScrolling = YES;
     //stop editing (if there is some)
     [self stopEditing];
-    self.xmppAccount = [[MLXMPPManager sharedInstance] getConnectedAccountForID:self.contact.accountId];
+    self.xmppAccount = self.contact.account;
     if(!self.xmppAccount) DDLogDebug(@"Disabled account detected");
 
     [MLNotificationManager sharedInstance].currentContact = self.contact;