Cleanup of #9cf6d0f

Author: tmolitor-stud-tu

Monal/Classes/MLMucProcessor.m

@@ -88,7 +88,6 @@ -(id) initWithAccount:(xmpp*) account
     _hasFetchedBookmarks = NO;
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleResourceBound:) name:kMLResourceBoundNotice object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleSessionInit:) name:kMLSessionInitNotice object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleCatchupDone:) name:kMonalFinishedCatchup object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleSentMessage:) name:kMonalSentMessageNotice object:nil];
     return self;
@@ -175,18 +174,6 @@ -(void) handleResourceBound:(NSNotification*) notification
     }
 }
 
--(void) handleSessionInit:(NSNotification*) notification
-{
-    //this event will be called as soon as we are starting to initialize our session, but BEFORE mam catchup happens
-    //NOTE: this event won't be called for smacks resumes!
-    if(_account == ((xmpp*)notification.object))
-    {
-        //join MUCs from (current) muc_favorites db, the pending bookmarks fetch will join the remaining currently unknown mucs
-        for(NSString* room in [[DataLayer sharedInstance] listMucsForAccount:_account.accountID])
-            [self join:room];
-    }
-}
-
 -(void) handleCatchupDone:(NSNotification*) notification
 {
     //this event will be called as soon as mam OR smacks catchup on our account is done, it does not wait for muc mam catchups!

Monal/Classes/MLOMEMO.m

@@ -173,7 +173,7 @@ -(void) handleResourceBound:(NSNotification*) notification
 #ifndef DISABLE_OMEMO
     if(self.account.accountID.intValue == ((xmpp*)notification.object).accountID.intValue)
     {
-        DDLogInfo(@"We did a non-smacks-resume reconnect, resetting some of our state...");
+        DDLogInfo(@"We did a non-smacks-resume reconnect, resetting some of our state (MLOMEMO instance=%@)...", self);
         DDLogVerbose(@"Current state: %@", self.state);
 
         //we bound a new xmpp session --> reset our whole state

Monal/Classes/xmpp.h

@@ -27,7 +27,8 @@ typedef NS_ENUM (NSInteger, xmppState) {
     kStateLoggedIn,
     kStateBinding,
     kStateBound,
-    kStateInitStarted,		//is operating normally
+    kStateInitStarted,		//initializing session (smacks resume and non-smacks resume)
+    kStateCatchupDone,		//is operating normally
 };
 
 typedef NS_ENUM (NSInteger, xmppRegistrationState) {

Monal/Classes/xmpp.m

@@ -49,7 +49,7 @@
 @import AVFoundation;
 @import SAMKeychain;
 
-#define STATE_VERSION 19
+#define STATE_VERSION 20
 #define CONNECT_TIMEOUT 7.0
 #define IQ_TIMEOUT 60.0
 NSString* const kQueueID = @"queueID";
@@ -921,6 +921,7 @@ -(void) connect
 
         //mark this account as currently connecting
         self->_accountState = kStateReconnecting;
+        [self accountStatusChanged];
 
         //only proceed with connection if not concurrent with other processes
         DDLogVerbose(@"Checking remote process lock...");
@@ -933,6 +934,7 @@ -(void) connect
         {
             DDLogInfo(@"MainApp is running, not connecting (this should transition us into idle state again which will terminate this extension)");
             self->_accountState = kStateDisconnected;
+            [self accountStatusChanged];
             return;
         }
 
@@ -952,6 +954,7 @@ -(void) connect
         {
             DDLogError(@"Server disallows xmpp connections for account '%@', ignoring login", self.accountID);
             self->_accountState = kStateDisconnected;
+            [self accountStatusChanged];
             return;
         }
 
@@ -1236,6 +1239,8 @@ -(void) closeSocket
         //we don't throw away operations in the receive queue because they could be more than just stanzas
         //(for example outgoing messages that should be written to the smacks queue instead of just vanishing in a void)
         //all incoming stanzas in the receive queue will honor the _accountState being lower than kStateReconnecting and be dropped
+        
+        [self accountStatusChanged];
     }];
 }
 
@@ -2404,12 +2409,13 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
             self.resuming = NO;
             self.isDoingFullReconnect = NO;
 
-            //now we are initialized again (the following block is *largely* taken from earlyInitSession
+            //now we are initialized again (the following block is *largely* taken from earlyInitSession)
             DDLogInfo(@"Session resumed, initializing state...");
             self.isDoingFullReconnect = YES;
             _connectedTime = [NSDate date];
             _reconnectBackoffTime = 0;
             _accountState = kStateInitStarted;
+            [[MLNotificationQueue currentQueue] postNotificationName:kMLSessionInitNotice object:self];
             [self accountStatusChanged];
 
             @synchronized(_stateLockObject) {
@@ -2562,6 +2568,7 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
 
             self->_accountState = kStateLoggedIn;
             [[MLNotificationQueue currentQueue] postNotificationName:kMLIsLoggedInNotice object:self];
+            [self accountStatusChanged];
 
             _usableServersList = [NSMutableArray new];       //reset list to start again with the highest SRV priority on next connect
             if(_loginTimer)
@@ -2793,6 +2800,8 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
             //NOTE: we don't have any stream restart when using SASL2
             //NOTE: we don't need to pipeline anything here, because SASL2 sends out the new stream features immediately without a stream restart
             _cachedStreamFeaturesAfterAuth = nil;       //make sure we don't accidentally try to do pipelining
+            
+            [self accountStatusChanged];
         }
         else if([parsedStanza check:@"/{urn:xmpp:sasl:2}continue"])
         {
@@ -2843,7 +2852,10 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
         {
             //prevent reconnect attempt
             if(_accountState < kStateHasStream)
+            {
                 _accountState = kStateHasStream;
+                [self accountStatusChanged];
+            }
 
             //perform logic to handle stream
             if(self.accountState < kStateLoggedIn)
@@ -2867,7 +2879,7 @@ -(void) processInput:(MLXMLNode*) parsedStanza withDelayedReplay:(BOOL) delayedR
                     [self handleFeaturesAfterAuth:parsedStanza];
                 }
                 else
-                    DDLogDebug(@"Stream features (after auth) already read from cache, ignoring incoming stream features (but refreshing cache).\n Cached: %@\nIncoming: %@", _cachedStreamFeaturesAfterAuth, parsedStanza);
+                    DDLogDebug(@"Stream features (after auth) already read from cache, ignoring incoming stream features (but refreshing cache).\nCached: %@\nIncoming: %@", _cachedStreamFeaturesAfterAuth, parsedStanza);
                 _cachedStreamFeaturesAfterAuth = parsedStanza;
             }
         }
@@ -3686,7 +3698,7 @@ -(void) realPersistState
             [[DataLayer sharedInstance] persistState:values forAccount:self.accountID];
 
             //debug output
-            DDLogVerbose(@"%@ --> persistState(saved at %@):\n\tisDoingFullReconnect=%@,\n\tlastHandledInboundStanza=%@,\n\tlastHandledOutboundStanza=%@,\n\tlastOutboundStanza=%@,\n\t#unAckedStanzas=%lu%s,\n\tstreamID=%@\n\tlastInteractionDate=%@\n\tpersistentIqHandlers=%@\n\tsupportsHttpUpload=%d\n\tpushEnabled=%d\n\tsupportsPubSub=%d\n\tsupportsModernPubSub=%d\n\tsupportsPubSubMax=%d\n\taccountDiscoDone=%d\n\t_inCatchup=%@\n\tomemo.state=%@\n\thasSeenOmemoDeviceListAfterOwnDeviceid=%@\n",
+            DDLogVerbose(@"%@ --> persistState(saved at %@):\n\tisDoingFullReconnect=%@,\n\tlastHandledInboundStanza=%@,\n\tlastHandledOutboundStanza=%@,\n\tlastOutboundStanza=%@,\n\t#unAckedStanzas=%lu%s,\n\tstreamID=%@\n\tlastInteractionDate=%@\n\tpersistentIqHandlers=%@\n\tsupportsHttpUpload=%d\n\tpushEnabled=%d\n\tsupportsPubSub=%d\n\tsupportsModernPubSub=%d\n\tsupportsPubSubMax=%d\n\taccountDiscoDone=%d\n\t_inCatchup=%@\n\tomemo.state=%@\n\thasSeenOmemoDeviceListAfterOwnDeviceid=%@\n\t_cachedStreamFeaturesBeforeAuth=%@\n\t_cachedStreamFeaturesAfterAuth=%@\n",
                 self.accountID,
                 values[@"stateSavedAt"],
                 bool2str(self.isDoingFullReconnect),
@@ -3705,7 +3717,9 @@ -(void) realPersistState
                 self.connectionProperties.accountDiscoDone,
                 self->_inCatchup,
                 self.omemo.state,
-                bool2str(self.hasSeenOmemoDeviceListAfterOwnDeviceid)
+                bool2str(self.hasSeenOmemoDeviceListAfterOwnDeviceid),
+                bool2str(self->_cachedStreamFeaturesBeforeAuth!=nil),
+                bool2str(self->_cachedStreamFeaturesAfterAuth!=nil)
             );
             DDLogVerbose(@"%@ --> realPersistState after: used/available memory: %.3fMiB / %.3fMiB)...", self.accountID, [HelperTools report_memory], (CGFloat)os_proc_available_memory() / 1048576);
         }
@@ -3882,7 +3896,7 @@ -(void) realReadState
             }
 
             //debug output
-            DDLogVerbose(@"%@ --> readState(saved at %@):\n\tisDoingFullReconnect=%@,\n\tlastHandledInboundStanza=%@,\n\tlastHandledOutboundStanza=%@,\n\tlastOutboundStanza=%@,\n\t#unAckedStanzas=%lu%s,\n\tstreamID=%@,\n\tlastInteractionDate=%@\n\tpersistentIqHandlers=%@\n\tsupportsHttpUpload=%d\n\tpushEnabled=%d\n\tsupportsPubSub=%d\n\tsupportsModernPubSub=%d\n\tsupportsPubSubMax=%d\n\taccountDiscoDone=%d\n\t_inCatchup=%@\n\tomemo.state=%@\n\thasSeenOmemoDeviceListAfterOwnDeviceid=%@\n",
+            DDLogVerbose(@"%@ --> readState(saved at %@):\n\tisDoingFullReconnect=%@,\n\tlastHandledInboundStanza=%@,\n\tlastHandledOutboundStanza=%@,\n\tlastOutboundStanza=%@,\n\t#unAckedStanzas=%lu%s,\n\tstreamID=%@,\n\tlastInteractionDate=%@\n\tpersistentIqHandlers=%@\n\tsupportsHttpUpload=%d\n\tpushEnabled=%d\n\tsupportsPubSub=%d\n\tsupportsModernPubSub=%d\n\tsupportsPubSubMax=%d\n\taccountDiscoDone=%d\n\t_inCatchup=%@\n\tomemo.state=%@\n\thasSeenOmemoDeviceListAfterOwnDeviceid=%@\n\t_cachedStreamFeaturesBeforeAuth=%@\n\t_cachedStreamFeaturesAfterAuth=%@\n",
                 self.accountID,
                 dic[@"stateSavedAt"],
                 bool2str(self.isDoingFullReconnect),
@@ -3901,7 +3915,9 @@ -(void) realReadState
                 self.connectionProperties.accountDiscoDone,
                 self->_inCatchup,
                 self.omemo.state,
-                bool2str(self.hasSeenOmemoDeviceListAfterOwnDeviceid)
+                bool2str(self.hasSeenOmemoDeviceListAfterOwnDeviceid),
+                bool2str(self->_cachedStreamFeaturesBeforeAuth!=nil),
+                bool2str(self->_cachedStreamFeaturesAfterAuth!=nil)
             );
             if(self.unAckedStanzas)
                 for(NSDictionary* dic in self.unAckedStanzas)
@@ -3987,6 +4003,7 @@ -(void) bindResource:(NSString*) resource
 
     self.isDoingFullReconnect = YES;
     _accountState = kStateBinding;
+    [self accountStatusChanged];
 
     //delete old resources because we get new presences once we're done initializing the session
     [[DataLayer sharedInstance] resetContactsForAccount:self.accountID];
@@ -4211,6 +4228,10 @@ -(void) initSession
     //fetch current mds state
     [self.pubsub fetchNode:@"urn:xmpp:mds:displayed:0" from:self.connectionProperties.identity.jid withItemsList:nil andHandler:$newHandler(MLPubSubProcessor, handleMdsFetchResult)];
 
+    //join MUCs from (current) muc_favorites db, the pending bookmarks fetch will join the remaining currently unknown mucs
+    for(NSString* room in [[DataLayer sharedInstance] listMucsForAccount:self.accountID])
+        [self.mucProcessor join:room];
+    
     //NOTE: mam query will be done in MLIQProcessor once the disco result for our own jid/account returns
 
     //initialize stanza counter for statistics
@@ -4854,6 +4875,7 @@ -(void)stream:(NSStream*) stream handleEvent:(NSStreamEvent) eventCode
                         self->_blockToCallOnTCPOpen();
                         self->_blockToCallOnTCPOpen = nil;     //don't call this twice
                     }
+                    [self accountStatusChanged];
                 }];
             }
             break;
@@ -5443,8 +5465,10 @@ -(void) handleFinishedCatchup
     }
     [self persistState];
 
+    _accountState = kStateCatchupDone;
     //don't queue this notification because it should be handled INLINE inside the receive queue
     [[NSNotificationCenter defaultCenter] postNotificationName:kMonalFinishedCatchup object:self userInfo:nil];
+    [self accountStatusChanged];
 }
 
 -(void) updateMdsData:(NSDictionary*) mdsData