6.4.19-b2 (#1587)

- Fixed endless loop adding/removing devices from omemo devicelist
- Some more small fixes/improvements

Author: tmolitor-stud-tu

Monal/Classes/MLCall.m

@@ -899,7 +899,7 @@ -(void) offerSDP
             self.localSDP = sdpIQ;
         }
         [self.account sendIq:sdpIQ withResponseHandler:^(XMPPIQ* result) {
-            DDLogDebug(@"Received SDP response for offer: %@", result);
+            DDLogDebug(@"Received response iq for SDP offer: %@", result);
         } andErrorHandler:^(XMPPIQ* error) {
             DDLogError(@"Got error for SDP offer: %@", error);
         }];
@@ -1741,7 +1741,11 @@ -(void) processIncomingSDP:(NSNotification*) notification
                         @"action": @"session-accept",
                         @"sid": self.jmiid,
                     } andChildren:children andData:nil]];
-                    [self.account send:sdpIQ];
+                    [self.account sendIq:sdpIQ withResponseHandler:^(XMPPIQ* result) {
+                        DDLogDebug(@"Received response iq for SDP asnwer: %@", result);
+                    } andErrorHandler:^(XMPPIQ* error) {
+                        DDLogError(@"Got error for SDP answer: %@", error);
+                    }];
 
                     @synchronized(self.candidateQueueLock) {
                         self.localSDP = sdpIQ;

Monal/Classes/MLIQProcessor.m

@@ -173,7 +173,6 @@ +(void) processResultIq:(XMPPIQ*) iqNode forAccount:(xmpp*) account
     //WARNING: be careful adding stateless result handlers here (those can impose security risks!)
 
     DDLogWarn(@"Got unhandled result IQ: %@", iqNode);
-    [self respondWithErrorTo:iqNode onAccount:account];
 }
 
 +(void) processErrorIq:(XMPPIQ*) iqNode forAccount:(xmpp*) account

Monal/Classes/MLOMEMO.m

@@ -286,6 +286,8 @@ -(void) repairQueuedSessions
     [self checkBundleFetchCount];
 
     DDLogVerbose(@"New state: %@", self.state);
+    
+    [self cleanupOwnOldDevices];
 }
 
 -(void) retriggerKeyTransportElementsForJid:(NSString*) jid
@@ -308,6 +310,8 @@ -(void) retriggerKeyTransportElementsForJid:(NSString*) jid
         [self.state.queuedKeyTransportElements removeObjectForKey:jid];
         [self sendKeyTransportElement:jid forRids:rids];
     }
+    
+    [self cleanupOwnOldDevices];
 }
 
 $$instance_handler(devicelistHandler, account.omemo, $$ID(xmpp*, account), $$ID(NSString*, node), $$ID(NSString*, jid), $$ID(NSString*, type), $_ID((NSDictionary<NSString*, MLXMLNode*>*), data))
@@ -562,8 +566,30 @@ -(void) handleOwnDevicelistUpdate:(NSSet<NSNumber*>*) receivedDevices
 
 -(void) cleanupOwnOldDevices
 {
-    NSMutableArray* deletedDevices = [NSMutableArray new];
     NSString* jid = self.account.connectionProperties.identity.jid;
+    
+    //don't try to clean up in all these cases
+    @synchronized(self.state.queuedKeyTransportElements) {
+        if(self.state.queuedKeyTransportElements[jid] != nil && [self.state.queuedKeyTransportElements[jid] count] > 0)
+        {
+            DDLogWarn(@"Not cleaning up own old devices: key transport elements still queued!");
+            return;
+        }
+    }
+    @synchronized(self.state.queuedSessionRepairs) {
+        if(self.state.queuedSessionRepairs[jid] != nil && [self.state.queuedSessionRepairs[jid] count] > 0)
+        {
+            DDLogWarn(@"Not cleaning up own old devices: session repairs still queued!");
+            return;
+        }
+    }
+    if(self.state.openBundleFetches[jid] != nil && self.state.openBundleFetches[jid].count > 0)
+    {
+        DDLogWarn(@"Not cleaning up own old devices: bundle fetches still pending!");
+        return;
+    }
+    
+    NSMutableArray* deletedDevices = [NSMutableArray new];
     for(NSNumber* device in [self.ownDeviceList copy])
     {
         SignalAddress* address = [[SignalAddress alloc] initWithName:jid deviceId:(uint32_t)device.unsignedIntValue];
@@ -580,13 +606,17 @@ -(void) cleanupOwnOldDevices
         //this is what conversations does, too
         if(trust == MLOmemoToFUButNoMsgSeenInTime || trust == MLOmemoTrustedButNoMsgSeenInTime)
         {
+            DDLogWarn(@"Device %@ is old, trust=%d --> deleting...", device, trust);
             [self bulkDeleteDeviceForSource:jid andRid:device];
             [deletedDevices addObject:device];
         }
     }
     //publish our changes, but only if we actually changed someting
     if(deletedDevices.count > 0)
+    {
+        DDLogInfo(@"Deleted at least one device in our own devicelist, publishing the cleaned up devicelist now...");
         [self publishOwnDeviceList];
+    }
 }
 
 -(void) publishOwnDeviceList
@@ -1430,8 +1460,10 @@ -(NSString* _Nullable) decryptOmemoEnvelope:(MLXMLNode*) envelope forSenderJid:(
             }
 
             //make sure the dh ratchet always advances, even on "receive only" devices
-            //--> force a key transport message with 1% probability (~ every 100th message)
-            if(arc4random_uniform(100)==42)
+            //--> force a key transport message with 1% probability
+            //that means after 100 messages there is a 87% probability we sent at least one key transport message
+            //and after 200 messages the probability for at least one key transport message is 98% (its 99,9% after 341 messages)
+            if(arc4random_uniform(50)==42)
                 [self sendKeyTransportElement:senderJid forRids:[NSSet setWithArray:@[sid]]];
 
             //some clients have the auth parameter in the ciphertext?

Monal/Classes/MLXMPPManager.m

@@ -497,8 +497,16 @@ -(void) connectAccountWithDictionary:(NSDictionary*) account
         }
         DDLogInfo(@"existing account, calling unfreeze");
         [existing unfreeze];
-        DDLogInfo(@"existing account, just pinging.");
-        [existing sendPing:SHORT_PING];     //short ping timeout to quickly check if connectivity is still okay
+        if(existing.accountState<kStateReconnecting)
+        {
+            DDLogInfo(@"disconnected existing account, reconnecting.");
+            [existing connect];
+        }
+        else
+        {
+            DDLogInfo(@"connected(?) existing account, just pinging.");
+            [existing sendPing:SHORT_PING];     //short ping timeout to quickly check if connectivity is still okay
+        }
         return;
     }
     DDLogVerbose(@"connecting account %@@%@",[account objectForKey:kUsername], [account objectForKey:kDomain]);