Correct cleaning (dealloc) of controller and observers

tchapgouv · Oct 11, 2023 · 823897a · 823897a
1 parent b2b2be5
commit 823897a
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
@@ -378,19 +378,9 @@ - (void)finalizeInit
     self.screenTracker = [[AnalyticsScreenTracker alloc] initWithScreen:AnalyticsScreenSettings];
 }
 
+// Tchap: fix for destroy not being called (https://github.com/vector-im/element-ios/pull/7697)
 - (void)dealloc {
-    // Remove observers
-    if (pushInfoUpdateObserver)
-    {
-        [[NSNotificationCenter defaultCenter] removeObserver:pushInfoUpdateObserver name:kMXKAccountAPNSActivityDidChangeNotification object:nil];
-        pushInfoUpdateObserver = nil;
-    }
-
-    if (emailInfoUpdateObserver)
-    {
-        [[NSNotificationCenter defaultCenter] removeObserver:emailInfoUpdateObserver name:kMXKAccountEmailActivityDidChangeNotification object:nil];
-        emailInfoUpdateObserver = nil;
-    }
+    [self destroy];
 }
 
 - (void)updateSections
@@ -1033,6 +1023,13 @@ - (void)reset
         pushInfoUpdateObserver = nil;
     }
 
+    // Tchap: remove Email notification update observer
+    if (emailInfoUpdateObserver)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:emailInfoUpdateObserver name:kMXKAccountEmailActivityDidChangeNotification object:nil];
+        emailInfoUpdateObserver = nil;
+    }
+
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
     onReadyToDestroyHandler = nil;