Get rid of try/catches around removing observers

mehfooz09 · Mar 9, 2020 · 7ec3193 · 7ec3193
1 parent 670dfec
commit 7ec3193
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/app/AboutAppearanceViewController.m b/app/AboutAppearanceViewController.m
@@ -19,19 +19,17 @@ @interface AboutAppearanceViewController ()
 
 @implementation AboutAppearanceViewController
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
+- (void)awakeFromNib {
+    [super awakeFromNib];
     [[UserPreferences shared] addObserver:self forKeyPath:@"theme" options:NSKeyValueObservingOptionNew context:nil];
     [[UserPreferences shared] addObserver:self forKeyPath:@"fontSize" options:NSKeyValueObservingOptionNew context:nil];
     [[UserPreferences shared] addObserver:self forKeyPath:@"fontFamily" options:NSKeyValueObservingOptionNew context:nil];
 }
 
 - (void)dealloc {
-    @try {
-        [[UserPreferences shared] removeObserver:self forKeyPath:@"theme"];
-        [[UserPreferences shared] removeObserver:self forKeyPath:@"fontSize"];
-        [[UserPreferences shared] removeObserver:self forKeyPath:@"fontFamily"];
-    } @catch (NSException * __unused exception) {}
+    [[UserPreferences shared] removeObserver:self forKeyPath:@"theme"];
+    [[UserPreferences shared] removeObserver:self forKeyPath:@"fontSize"];
+    [[UserPreferences shared] removeObserver:self forKeyPath:@"fontFamily"];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {

diff --git a/app/AboutNavigationController.m b/app/AboutNavigationController.m
@@ -14,15 +14,13 @@ @interface AboutNavigationController ()
 
 @implementation AboutNavigationController
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
+- (void)awakeFromNib {
+    [super awakeFromNib];
     [[UserPreferences shared] addObserver:self forKeyPath:@"theme" options:NSKeyValueObservingOptionNew|NSKeyValueObservingOptionInitial context:nil];
 }
 
 - (void)dealloc {
-    @try {
-        [[UserPreferences shared] removeObserver:self forKeyPath:@"theme"];
-    } @catch (NSException * __unused exception) {}
+    [[UserPreferences shared] removeObserver:self forKeyPath:@"theme"];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {

diff --git a/app/AboutViewController.m b/app/AboutViewController.m
@@ -28,9 +28,13 @@ @interface AboutViewController ()
 
 @implementation AboutViewController
 
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    [self _addObservers];
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self _addObservers];
     [self _updatePreferenceUI];
 }
 
@@ -49,13 +53,11 @@ - (void)_addObservers {
 }
 
 - (void)_removeObservers {
-    @try {
-        UserPreferences *prefs = [UserPreferences shared];
-        [prefs removeObserver:self forKeyPath:@"capsLockMapping"];
-        [prefs removeObserver:self forKeyPath:@"fontSize"];
-        [prefs removeObserver:self forKeyPath:@"launchCommand"];
-        [prefs removeObserver:self forKeyPath:@"bootCommand"];
-    } @catch (NSException * __unused exception) {}
+    UserPreferences *prefs = [UserPreferences shared];
+    [prefs removeObserver:self forKeyPath:@"capsLockMapping"];
+    [prefs removeObserver:self forKeyPath:@"fontSize"];
+    [prefs removeObserver:self forKeyPath:@"launchCommand"];
+    [prefs removeObserver:self forKeyPath:@"bootCommand"];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {

diff --git a/app/TerminalViewController.m b/app/TerminalViewController.m
@@ -72,7 +72,6 @@ - (void)viewDidLoad {
                  object:nil];
 
     [self _updateStyleFromPreferences:NO];
-    [[UserPreferences shared] addObserver:self forKeyPath:@"theme" options:NSKeyValueObservingOptionNew context:nil];
 
     if (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad) {
         [self.bar removeArrangedSubview:self.hideKeyboardButton];
@@ -105,6 +104,7 @@ - (void)awakeFromNib {
                                            selector:@selector(processExited:)
                                                name:ProcessExitedNotification
                                              object:nil];
+    [[UserPreferences shared] addObserver:self forKeyPath:@"theme" options:NSKeyValueObservingOptionNew context:nil];
 }
 
 - (void)startNewSession {
@@ -189,9 +189,7 @@ - (void)showMessage:(NSString *)message subtitle:(NSString *)subtitle {
 }
 
 - (void)dealloc {
-    @try {
-        [[UserPreferences shared] removeObserver:self forKeyPath:@"theme"];
-    } @catch (NSException * __unused exception) {}
+    [[UserPreferences shared] removeObserver:self forKeyPath:@"theme"];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {