From 3350db4a24474e93ee62bbef6817258008358bc6 Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 24 Jan 2017 13:47:32 +0100 Subject: [PATCH] Warn that logging out will lose E2E keys (#950). Add a check on weakSelf. --- .../ViewController/SettingsViewController.m | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Vector/ViewController/SettingsViewController.m b/Vector/ViewController/SettingsViewController.m index 80383f6d9..509f0280a 100644 --- a/Vector/ViewController/SettingsViewController.m +++ b/Vector/ViewController/SettingsViewController.m @@ -1619,19 +1619,22 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); [currentAlert addActionWithTitle:NSLocalizedStringFromTable(@"settings_sign_out", @"Vector", nil) style:MXKAlertActionStyleDefault handler:^(MXKAlert *alert) { - __strong __typeof(weakSelf)strongSelf = weakSelf; - strongSelf->currentAlert = nil; + if (weakSelf) + { + __strong __typeof(weakSelf)strongSelf = weakSelf; + strongSelf->currentAlert = nil; - // Feedback: disable button and run activity indicator - UIButton *button = (UIButton*)sender; - button.enabled = NO; - [strongSelf startActivityIndicator]; + // Feedback: disable button and run activity indicator + UIButton *button = (UIButton*)sender; + button.enabled = NO; + [strongSelf startActivityIndicator]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ - [[MXKAccountManager sharedManager] logout]; - - }); + [[MXKAccountManager sharedManager] logout]; + + }); + } }]; currentAlert.cancelButtonIndex = [currentAlert addActionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:MXKAlertActionStyleDefault handler:^(MXKAlert *alert){