6.4.12 (#1440)

- Fixed handling of fromUser and toUser in muc mam queries
MACOS_ONLY - Removed keyboard shortcut for "archive conversation"
MACOS_ONLY - MacOS Menu entires are now translatable
- Contacts from the address book can now be shared again., thanks Melvo
- Fix crashes when connectivity is unstable
- Don't play call error sounds indefinitely
- Fix bug in roster subscription handling

Author: tmolitor-stud-tu

Monal/Classes/AVCallUI.swift

@@ -610,8 +610,8 @@ struct AVCallUI: View {
             UIApplication.shared.isIdleTimerDisabled = true
 
             self.ringingPlayer.numberOfLoops = -1
-            self.busyPlayer.numberOfLoops = -1
-            self.errorPlayer.numberOfLoops = -1
+            self.busyPlayer.numberOfLoops = 6
+            self.errorPlayer.numberOfLoops = 6
 
             //ask for mic permissions
             AVAudioSession.sharedInstance().requestRecordPermission { granted in

Monal/Classes/HelperTools.m

@@ -1187,16 +1187,27 @@ +(void) handleUploadItemProvider:(NSItemProvider*) provider withCompletionHandle
     }*/
     else if([provider hasItemConformingToTypeIdentifier:UTTypeContact.identifier])
     {
-        [provider loadItemForTypeIdentifier:UTTypeContact.identifier options:nil completionHandler:^(NSURL*  _Nullable item, NSError* _Null_unspecified error) {
-            if(error != nil || item == nil)
+        [provider loadDataRepresentationForTypeIdentifier:UTTypeContact.identifier completionHandler:^(NSData* data, NSError* error) {
+            if(error != nil || data == nil)
             {
-                DDLogError(@"Error extracting item from NSItemProvider: %@", error);
-                payload[@"error"] = error;
-                return completion(payload);
+                DDLogWarn(@"Got error, retrying with NSURL: %@", error);
+                [provider loadItemForTypeIdentifier:UTTypeContact.identifier options:nil completionHandler:^(NSURL* _Nullable item, NSError* _Null_unspecified error) {
+                    if(error != nil || item == nil)
+                    {
+                        DDLogError(@"Error extracting contact item from NSItemProvider: %@", error);
+                        payload[@"error"] = error;
+                        return completion(payload);
+                    }
+                    DDLogInfo(@"Got contact item NSURL: %@", item);
+                    payload[@"type"] = @"contact";
+                    return prepareFile(item);
+                }];
+                return;
             }
-            DDLogInfo(@"Got contact item: %@", item);
+            DDLogInfo(@"Got contact item NSData: %@", data);
             payload[@"type"] = @"contact";
-            return prepareFile(item);
+            payload[@"data"] = [MLFiletransfer prepareDataUpload:data withFileExtension:@"vcf"];
+            return [HelperTools addUploadItemPreviewForItem:nil provider:provider andPayload:payload withCompletionHandler:completion];
         }];
     }
     else if([provider hasItemConformingToTypeIdentifier:UTTypeFileURL.identifier])

Monal/Classes/MLUDPLogger.m

@@ -290,12 +290,18 @@ -(void) realLogMessage:(DDLogMessage*) logMessage isDirect:(BOOL) direct
         [[self class] logError:@"not sending message, too big: %lu", (unsigned long)data.length];
     else
         dispatch_async(_send_queue, ^{
-            [self sendData:data withOriginalMessage:logMessage->_message];
+            [self sendData:data withOriginalMessage:logMessage->_message andRetryCounter:0];
         });
 }
 
--(void) sendData:(NSData*) data withOriginalMessage:(NSString*) msg
+-(void) sendData:(NSData*) data withOriginalMessage:(NSString*) msg andRetryCounter:(int) retryCounter
 {
+    if(retryCounter>8)
+    {
+        [[self class] logError:@"not retrying send, retry counter reached: %@", msg];
+        return;
+    }
+    
     [self createConnectionIfNeeded];
 
     //the call to dispatch_get_main_queue() is a dummy because we are using DISPATCH_DATA_DESTRUCTOR_DEFAULT which is performed inline
@@ -326,7 +332,7 @@ -(void) sendData:(NSData*) data withOriginalMessage:(NSString*) msg
         //retry
         //[self disconnect];
         [[self class] logError:@"retrying sendData with error: %@", _last_error];
-        [self sendData:data withOriginalMessage:msg];
+        [self sendData:data withOriginalMessage:msg andRetryCounter:retryCounter+1];
     }
 }
 

Monal/Classes/MonalAppDelegate.m

@@ -1315,23 +1315,23 @@ -(void) buildMenuWithBuilder:(id<UIMenuBuilder>) builder
 {
     [super buildMenuWithBuilder:builder];
     //monal
-    UIKeyCommand* preferencesCommand = [UIKeyCommand commandWithTitle:@"Preferences..." image:nil action:@selector(showSettings) input:@"," modifierFlags:UIKeyModifierCommand propertyList:nil];
+    UIKeyCommand* preferencesCommand = [UIKeyCommand commandWithTitle:NSLocalizedString(@"Preferences...", @"") image:nil action:@selector(showSettings) input:@"," modifierFlags:UIKeyModifierCommand propertyList:nil];
 
     UIMenu* preferencesMenu = [UIMenu menuWithTitle:@"" image:nil identifier:@"im.monal.preferences" options:UIMenuOptionsDisplayInline children:@[preferencesCommand]];
     [builder insertSiblingMenu:preferencesMenu afterMenuForIdentifier:UIMenuAbout];
 
     //file
-    UIKeyCommand* newCommand = [UIKeyCommand commandWithTitle:@"New Message" image:nil action:@selector(showNew) input:@"N" modifierFlags:UIKeyModifierCommand propertyList:nil];
+    UIKeyCommand* newCommand = [UIKeyCommand commandWithTitle:NSLocalizedString(@"New Message", @"") image:nil action:@selector(showNew) input:@"N" modifierFlags:UIKeyModifierCommand propertyList:nil];
 
     UIMenu* newMenu = [UIMenu menuWithTitle:@"" image:nil identifier:@"im.monal.new" options:UIMenuOptionsDisplayInline children:@[newCommand]];
     [builder insertChildMenu:newMenu atStartOfMenuForIdentifier:UIMenuFile];
 
-    UIKeyCommand* detailsCommand = [UIKeyCommand commandWithTitle:@"Details..." image:nil action:@selector(showDetails) input:@"I" modifierFlags:UIKeyModifierCommand propertyList:nil];
+    UIKeyCommand* detailsCommand = [UIKeyCommand commandWithTitle:NSLocalizedString(@"Details...", @"") image:nil action:@selector(showDetails) input:@"I" modifierFlags:UIKeyModifierCommand propertyList:nil];
 
     UIMenu* detailsMenu = [UIMenu menuWithTitle:@"" image:nil identifier:@"im.monal.detail" options:UIMenuOptionsDisplayInline children:@[detailsCommand]];
     [builder insertSiblingMenu:detailsMenu afterMenuForIdentifier:@"im.monal.new"];
 
-    UIKeyCommand* deleteCommand = [UIKeyCommand commandWithTitle:@"Delete Conversation" image:nil action:@selector(deleteConversation) input:@"\b" modifierFlags:UIKeyModifierCommand propertyList:nil];
+    UICommand* deleteCommand = [UICommand commandWithTitle:NSLocalizedString(@"Archive Conversation", @"") image:nil action:@selector(deleteConversation) propertyList:nil];
 
     UIMenu* deleteMenu = [UIMenu menuWithTitle:@"" image:nil identifier:@"im.monal.delete" options:UIMenuOptionsDisplayInline children:@[deleteCommand]];
     [builder insertSiblingMenu:deleteMenu afterMenuForIdentifier:@"im.monal.detail"];

Monal/Classes/xmpp.m

@@ -1918,7 +1918,7 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
                     // check if we need a contact request
                     NSDictionary* contactSub = [[DataLayer sharedInstance] getSubscriptionForContact:contact.contactJid andAccount:contact.accountId];
                     DDLogVerbose(@"Got subscription request for contact %@ having subscription status: %@", presenceNode.fromUser, contactSub);
-                    if(!contactSub || !([[contactSub objectForKey:@"subscription"] isEqualToString:kSubTo] || [[contactSub objectForKey:@"subscription"] isEqualToString:kSubBoth]))
+                    if(!contactSub || !([[contactSub objectForKey:@"subscription"] isEqualToString:kSubFrom] || [[contactSub objectForKey:@"subscription"] isEqualToString:kSubBoth]))
                         [[DataLayer sharedInstance] addContactRequest:contact];
                     else if(contactSub && [[contactSub objectForKey:@"subscription"] isEqualToString:kSubTo])
                         [self addToRoster:contact withPreauthToken:nil];
@@ -2134,6 +2134,27 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
                 //create a new XMPPMessage node instead of only a MLXMLNode because messages have some convenience properties and methods
                 messageNode = [[XMPPMessage alloc] initWithXMPPMessage:[outerMessageNode findFirst:@"{urn:xmpp:mam:2}result/{urn:xmpp:forward:0}forwarded/{jabber:client}message"]];
 
+                //sanity check: if mam query is not our own archive, this is a muc archive and the fromUser or toUser of
+                //the inner stanza should always match the bare jid of our muc we queried the archive of
+                XMPPIQ* mamQueryNode = _runningMamQueries[[outerMessageNode findFirst:@"{urn:xmpp:mam:2}result@queryid"]];  //we already checked for existence above
+                if(
+                    //not queried our own archive
+                    !(
+                        mamQueryNode.toUser==nil ||
+                        [@"" isEqualToString:mamQueryNode.toUser] ||
+                        [self.connectionProperties.identity.jid isEqualToString:mamQueryNode.toUser]
+                    //but fromUser or toUser is not the bare jid we queried the archive from
+                    ) && (
+                        ![messageNode.fromUser isEqualToString:mamQueryNode.toUser] ||
+                        ![messageNode.toUser isEqualToString:mamQueryNode.toUser]
+                    )
+                ) {
+                    DDLogError(@"muc mam results must not contain 1:1 message stanzas, ignoring this spoofed mam result having queryid: %@!", [outerMessageNode findFirst:@"{urn:xmpp:mam:2}result@queryid"]);
+                    //even these stanzas have to be counted by smacks
+                    [self incrementLastHandledStanzaWithDelayedReplay:delayedReplay];
+                    return;
+                }
+                
                 //move mam:2 delay timestamp into forwarded message stanza if the forwarded stanza does not have one already
                 //that makes parsing a lot easier later on and should not do any harm, even when resending/forwarding this inner stanza
                 if([outerMessageNode check:@"{urn:xmpp:mam:2}result/{urn:xmpp:forward:0}forwarded/{urn:xmpp:delay}delay"] && ![messageNode check:@"{urn:xmpp:delay}delay"])
@@ -2463,7 +2484,7 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
                 return [self invalidXMLError];
 
             //record TLS version
-            self.connectionProperties.tlsVersion = [((MLStream*)self->_oStream) isTLS13] ? @"1.3" : @"1.2";
+            self.connectionProperties.tlsVersion = [((MLStream*)self->_oStream) streamStatus] == NSStreamStatusOpen ? ([((MLStream*)self->_oStream) isTLS13] ? @"1.3" : @"1.2") : @"unknown";
 
             NSString* message = [parsedStanza findFirst:@"text#"];;
             if([parsedStanza check:@"not-authorized"])
@@ -2506,7 +2527,7 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
                 return [self invalidXMLError];
 
             //record TLS version
-            self.connectionProperties.tlsVersion = [((MLStream*)self->_oStream) isTLS13] ? @"1.3" : @"1.2";
+            self.connectionProperties.tlsVersion = [((MLStream*)self->_oStream) streamStatus] == NSStreamStatusOpen ? ([((MLStream*)self->_oStream) isTLS13] ? @"1.3" : @"1.2") : @"unknown";
 
             //perform logic to handle sasl success
             DDLogInfo(@"Got SASL Success");
@@ -2604,7 +2625,9 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
                 return;
             }
 
-            NSData* channelBindingData = [((MLStream*)self->_oStream) channelBindingDataForType:[self channelBindingToUse]];
+            NSData* channelBindingData = nil;
+            if([((MLStream*)self->_oStream) streamStatus] == NSStreamStatusOpen)
+                channelBindingData = [((MLStream*)self->_oStream) channelBindingDataForType:[self channelBindingToUse]];
             MLXMLNode* responseXML = [[MLXMLNode alloc] initWithElement:@"response" andNamespace:@"urn:xmpp:sasl:2" withAttributes:@{} andChildren:@[] andData:[HelperTools encodeBase64WithString:[self->_scramHandler clientFinalMessageWithChannelBindingData:channelBindingData]]];
             [self send:responseXML];
 
@@ -2684,7 +2707,7 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
                 self.connectionProperties.supportsSSDP = self->_scramHandler.ssdpSupported;
 
                 //record TLS version
-                self.connectionProperties.tlsVersion = [((MLStream*)self->_oStream) isTLS13] ? @"1.3" : @"1.2";
+                self.connectionProperties.tlsVersion = [((MLStream*)self->_oStream) streamStatus] == NSStreamStatusOpen ? ([((MLStream*)self->_oStream) isTLS13] ? @"1.3" : @"1.2") : @"unknown";
 
                 //make sure this error is reported, even if there are other SRV records left (we disconnect here and won't try again)
                 [HelperTools postError:message withNode:nil andAccount:self andIsSevere:YES andDisableAccount:YES];
@@ -2721,7 +2744,7 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
             self.connectionProperties.supportsSSDP = self->_scramHandler.ssdpSupported;
 
             //record TLS version
-            self.connectionProperties.tlsVersion = [((MLStream*)self->_oStream) isTLS13] ? @"1.3" : @"1.2";
+            self.connectionProperties.tlsVersion = [((MLStream*)self->_oStream) streamStatus] == NSStreamStatusOpen ? ([((MLStream*)self->_oStream) isTLS13] ? @"1.3" : @"1.2") : @"unknown";
 
             self->_scramHandler = nil;
             self->_blockToCallOnTCPOpen = nil;     //just to be sure but not strictly necessary
@@ -4564,14 +4587,6 @@ -(void) removeFromRoster:(MLContact*) contact
     //delete contact request if it exists
     [[DataLayer sharedInstance] deleteContactRequest:contact];
 
-    XMPPPresence* presence = [XMPPPresence new];
-    [presence unsubscribeContact:contact];
-    [self send:presence];
-    
-    XMPPPresence* presence2 = [XMPPPresence new];
-    [presence2 unsubscribedContact:contact];
-    [self send:presence2];
-    
     XMPPIQ* iq = [[XMPPIQ alloc] initWithType:kiqSetType];
     [iq setRemoveFromRoster:contact];
     [self send:iq];