Cleanup app suspension/resume process for serializable promises

monal-im · Dec 6, 2024 · a295b4a · a295b4a
1 parent 648b8b8
commit a295b4a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Monal/Classes/HelperTools.m b/Monal/Classes/HelperTools.m
@@ -2101,10 +2101,11 @@ +(void) signalSuspension
             [HelperTools flushLogsWithTimeout:0.100];
             dispatch_suspend([DDLog loggingQueue]);
             _suspensionHandlingIsSuspended = YES;
+
+            DDLogVerbose(@"Posting kMonalFrozen notification now...");
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMonalFrozen object:nil];
         }
     }
-    DDLogVerbose(@"Posting kMonalIsFreezed notification now...");
-    [[NSNotificationCenter defaultCenter] postNotificationName:kMonalIsFreezed object:nil];
 }
 
 +(void) signalResumption
@@ -2115,6 +2116,9 @@ +(void) signalResumption
             DDLogVerbose(@"Resuming logger queue...");
             dispatch_resume([DDLog loggingQueue]);
             _suspensionHandlingIsSuspended = NO;
+
+            DDLogVerbose(@"Posting kMonalUnfrozen notification now...");
+            [[NSNotificationCenter defaultCenter] postNotificationName:kMonalUnfrozen object:nil];
         }
     }
 }

diff --git a/Monal/Classes/MLConstants.h b/Monal/Classes/MLConstants.h
@@ -145,7 +145,8 @@ static inline NSString* _Nonnull LocalizationNotNeeded(NSString* _Nonnull s)
 #define kMonalIncomingSDP @"kMonalIncomingSDP"
 #define kMonalIncomingICECandidate @"kMonalIncomingICECandidate"
 #define kMonalWillBeFreezed @"kMonalWillBeFreezed"
-#define kMonalIsFreezed @"kMonalIsFreezed"
+#define kMonalFrozen @"kMonalFrozen"
+#define kMonalUnfrozen @"kMonalUnfrozen"
 #define kMonalNewMessageNotice @"kMonalNewMessageNotice"
 #define kMonalMucSubjectChanged @"kMonalMucSubjectChanged"
 #define kMonalDeletedMessageNotice @"kMonalDeletedMessageNotice"

diff --git a/Monal/Classes/MLProcessLock.m b/Monal/Classes/MLProcessLock.m
@@ -65,7 +65,7 @@ +(void) lock
         lock = flock(_ownLockFD, LOCK_EX | LOCK_NB);
         if(lock != 0)
             @throw [NSException exceptionWithName:@"LockingError" reason:[NSString stringWithFormat:@"flock returned: %d (%d) on file: %s", lock, errno, _ownLockPath] userInfo:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(unlock) name:kMonalIsFreezed object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(unlock) name:kMonalFrozen object:nil];
     }
 }
 

diff --git a/Monal/NotificationService/NotificationService.m b/Monal/NotificationService/NotificationService.m
@@ -133,7 +133,7 @@ -(void) killAppex
     [NotificationService setAppexCleanShutdownStatus:YES];
 
     DDLogInfo(@"Now killing appex process, goodbye...");
-    [HelperTools flushLogsWithTimeout:0.100];
+    [HelperTools signalSuspension];
     exit(0);
 }
 
@@ -424,6 +424,9 @@ +(void) initialize
 
     handlers = [NSMutableArray new];
 
+    //resume logging and other core tasks
+    [HelperTools signalResumption];
+
     //init IPC
     [IPC initializeForProcess:@"NotificationServiceExtension"];
     [MLProcessLock initializeForProcess:@"NotificationServiceExtension"];
@@ -602,7 +605,7 @@ -(void) serviceExtensionTimeWillExpire
 #endif
 
         DDLogInfo(@"Committing suicide...");
-        [DDLog flushLog];
+        [HelperTools signalSuspension];
         exit(0);
 
 /*