mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 07:42:40 +00:00
Merge pull request #1881 from vector-im/riot_1870
Settings: Add deactivate account
This commit is contained in:
SBiOSoftWhare
GitHub
commit
cfde2e7aba
8 changed files with 641 additions and 1 deletions
|
|
@ -110,6 +110,8 @@
|
|||
92726A4B1F58737A004AD26F /* SiriIntents.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 92726A431F58737A004AD26F /* SiriIntents.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
|
||||
92726A511F587410004AD26F /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92726A501F587410004AD26F /* Intents.framework */; };
|
||||
9D686B069F967C4D4BBC610F /* Pods_RiotPods_SiriIntents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB50EEBE8214352B9EBD6394 /* Pods_RiotPods_SiriIntents.framework */; };
|
||||
B19A173920B7F94800DF0BB0 /* DeactivateAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B19A173820B7F94800DF0BB0 /* DeactivateAccountViewController.m */; };
|
||||
B19A173B20B7F96700DF0BB0 /* DeactivateAccountViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B19A173A20B7F96700DF0BB0 /* DeactivateAccountViewController.storyboard */; };
|
||||
DDDE2AB95F865F2292B1D315 /* Pods_RiotPods_RiotShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23D7292481328A48B8D5D4ED /* Pods_RiotPods_RiotShareExtension.framework */; };
|
||||
F0131DE51F2200D600CBF707 /* RiotSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F0131DE41F2200D600CBF707 /* RiotSplitViewController.m */; };
|
||||
F0173EB51FCF346800B5F6A3 /* Vector.strings in Resources */ = {isa = PBXBuildFile; fileRef = F0173EAF1FCF346800B5F6A3 /* Vector.strings */; };
|
||||
|
|
@ -797,6 +799,9 @@
|
|||
92726A501F587410004AD26F /* Intents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Intents.framework; path = System/Library/Frameworks/Intents.framework; sourceTree = SDKROOT; };
|
||||
A5030B7C3C0B6EB83A9257BD /* Pods-RiotPods-Riot.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-Riot.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
B0FAA1A49F76B0CE15C5CBD8 /* Pods_RiotPods_Riot.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RiotPods_Riot.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
B19A173720B7F94800DF0BB0 /* DeactivateAccountViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeactivateAccountViewController.h; sourceTree = "<group>"; };
|
||||
B19A173820B7F94800DF0BB0 /* DeactivateAccountViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DeactivateAccountViewController.m; sourceTree = "<group>"; };
|
||||
B19A173A20B7F96700DF0BB0 /* DeactivateAccountViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = DeactivateAccountViewController.storyboard; sourceTree = "<group>"; };
|
||||
C195C53961EA28E6900AEB68 /* Pods-Riot.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Riot.release.xcconfig"; path = "Pods/Target Support Files/Pods-Riot/Pods-Riot.release.xcconfig"; sourceTree = "<group>"; };
|
||||
C5258DFF261AA3AB228A3F11 /* Pods-RiotPods-RiotShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-RiotShareExtension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
DB50EEBE8214352B9EBD6394 /* Pods_RiotPods_SiriIntents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RiotPods_SiriIntents.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
|
|
@ -1722,6 +1727,16 @@
|
|||
path = SiriIntents;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B19A173520B6F89900DF0BB0 /* DeactivateAccount */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B19A173720B7F94800DF0BB0 /* DeactivateAccountViewController.h */,
|
||||
B19A173820B7F94800DF0BB0 /* DeactivateAccountViewController.m */,
|
||||
B19A173A20B7F96700DF0BB0 /* DeactivateAccountViewController.storyboard */,
|
||||
);
|
||||
path = DeactivateAccount;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F0173EAE1FCF346800B5F6A3 /* vi.lproj */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -2288,6 +2303,7 @@
|
|||
24B5103F1EFA88CC004C6AD2 /* ReadReceiptsViewController.xib */,
|
||||
F0B4CBA31F418D0B008E99C5 /* WebViewViewController.h */,
|
||||
F0B4CBA41F418D0B008E99C5 /* WebViewViewController.m */,
|
||||
B19A173520B6F89900DF0BB0 /* DeactivateAccount */,
|
||||
);
|
||||
path = ViewController;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -3156,6 +3172,7 @@
|
|||
F083BDDA1E7009ED00A9B29C /* typing.png in Resources */,
|
||||
F083BE831E7009ED00A9B29C /* RecentTableViewCell.xib in Resources */,
|
||||
F046DC731FE1786500E3DAF0 /* GroupHomeViewController.xib in Resources */,
|
||||
B19A173B20B7F96700DF0BB0 /* DeactivateAccountViewController.storyboard in Resources */,
|
||||
F0E5D9141FF6FF3F00560D7F /* GroupRoomTableViewCell.xib in Resources */,
|
||||
F083BDB71E7009ED00A9B29C /* remove_icon@2x.png in Resources */,
|
||||
F083BDD31E7009ED00A9B29C /* settings_icon@3x.png in Resources */,
|
||||
|
|
@ -3636,6 +3653,7 @@
|
|||
F0E05A021E963103004B83FB /* FavouritesViewController.m in Sources */,
|
||||
F083BE941E7009ED00A9B29C /* FilesSearchTableViewCell.m in Sources */,
|
||||
F083BE921E7009ED00A9B29C /* SimpleRoomTitleView.m in Sources */,
|
||||
B19A173920B7F94800DF0BB0 /* DeactivateAccountViewController.m in Sources */,
|
||||
F083BE981E7009ED00A9B29C /* MessagesSearchResultTextMsgBubbleCell.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
|
|||
|
|
@ -113,6 +113,14 @@ extern NSString *const kAppDelegateNetworkStatusDidChangeNotification;
|
|||
*/
|
||||
- (void)logoutWithConfirmation:(BOOL)askConfirmation completion:(void (^)(BOOL isLoggedOut))completion;
|
||||
|
||||
/**
|
||||
Log out all the accounts without confirmation.
|
||||
Show the authentication screen on successful logout.
|
||||
|
||||
@param completion the block to execute at the end of the operation.
|
||||
*/
|
||||
- (void)logoutWithCompletion:(void (^)(BOOL isLoggedOut))completion;
|
||||
|
||||
#pragma mark - Matrix Accounts handling
|
||||
|
||||
- (void)selectMatrixAccount:(void (^)(MXKAccount *selectedAccount))onSelection;
|
||||
|
|
|
|||
|
|
@ -2667,6 +2667,16 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
|
|||
[topVC startActivityIndicator];
|
||||
}
|
||||
|
||||
[self logoutWithCompletion:^(BOOL isLoggedOut) {
|
||||
if (completion)
|
||||
{
|
||||
completion (YES);
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)logoutWithCompletion:(void (^)(BOOL isLoggedOut))completion
|
||||
{
|
||||
self.pushRegistry = nil;
|
||||
isPushRegistered = NO;
|
||||
|
||||
|
|
|
|||
|
|
@ -318,6 +318,7 @@
|
|||
"settings_flair" = "Show flair where allowed";
|
||||
"settings_devices" = "DEVICES";
|
||||
"settings_cryptography" = "CRYPTOGRAPHY";
|
||||
"settings_deactivate_account" = "DEACTIVATE ACCOUNT";
|
||||
|
||||
"settings_sign_out" = "Sign Out";
|
||||
"settings_sign_out_confirmation" = "Are you sure?";
|
||||
|
|
@ -398,6 +399,8 @@
|
|||
"settings_crypto_export" = "Export keys";
|
||||
"settings_crypto_blacklist_unverified_devices" = "Encrypt to verified devices only";
|
||||
|
||||
"settings_deactivate_my_account" = "Deactivate my account";
|
||||
|
||||
// Room Details
|
||||
"room_details_title" = "Room Details";
|
||||
"room_details_people" = "Members";
|
||||
|
|
@ -600,3 +603,22 @@
|
|||
// GDPR
|
||||
"gdpr_consent_not_given_alert_message" = "To continue using the %@ homeserver you must review and agree to the terms and conditions.";
|
||||
"gdpr_consent_not_given_alert_review_now_action" = "Review now";
|
||||
|
||||
// Deactivate account
|
||||
|
||||
"deactivate_account_title" = "Deactivate Account";
|
||||
|
||||
"deactivate_account_informations_part1" = "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. ";
|
||||
"deactivate_account_informations_part2_emphasize" = "This action is irreversible.";
|
||||
"deactivate_account_informations_part3" = "\n\nDeactivating your account ";
|
||||
"deactivate_account_informations_part4_emphasize" = "does not by default cause us to forget messages you have sent. ";
|
||||
"deactivate_account_informations_part5" = "If you would like us to forget your messages, please tick the box below\n\nMessage visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.";
|
||||
|
||||
"deactivate_account_forget_messages_information_part1" = "Please forget all messages I have sent when my account is deactivated (";
|
||||
"deactivate_account_forget_messages_information_part2_emphasize" = "Warning";
|
||||
"deactivate_account_forget_messages_information_part3" = ": this will cause future users to see an incomplete view of conversations)";
|
||||
|
||||
"deactivate_account_validate_action" = "Deactivate account";
|
||||
|
||||
"deactivate_account_password_alert_title" = "Deactivate Account";
|
||||
"deactivate_account_password_alert_message" = "To continue, please enter your password";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
Copyright 2018 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
@import UIKit;
|
||||
@import MatrixKit;
|
||||
|
||||
#pragma mark - Types
|
||||
|
||||
@class DeactivateAccountViewController;
|
||||
|
||||
#pragma mark - Protocol
|
||||
|
||||
@protocol DeactivateAccountViewControllerDelegate <NSObject>
|
||||
|
||||
- (void)deactivateAccountViewControllerDidCancel:(DeactivateAccountViewController*)deactivateAccountViewController;
|
||||
- (void)deactivateAccountViewControllerDidDeactivateWithSuccess:(DeactivateAccountViewController*)deactivateAccountViewController;
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - Interface
|
||||
|
||||
@interface DeactivateAccountViewController : MXKViewController
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
@property (nonatomic, weak) id<DeactivateAccountViewControllerDelegate> delegate;
|
||||
|
||||
#pragma mark - Class Methods
|
||||
|
||||
+ (DeactivateAccountViewController*)instantiateWithMatrixSession:(MXSession*)matrixSession;
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,327 @@
|
|||
/*
|
||||
Copyright 2018 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
#import "DeactivateAccountViewController.h"
|
||||
|
||||
#import "RiotDesignValues.h"
|
||||
#import "AppDelegate.h"
|
||||
|
||||
#pragma mark - Defines & Constants
|
||||
|
||||
static CGFloat const kButtonCornerRadius = 5.0;
|
||||
static CGFloat const kTextFontSize = 15.0;
|
||||
|
||||
#pragma mark - Private Interface
|
||||
|
||||
@interface DeactivateAccountViewController ()
|
||||
|
||||
#pragma mark - Outlets
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UILabel *deactivateAccountInfosLabel;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UILabel *forgetMessagesInfoLabel;
|
||||
@property (weak, nonatomic) IBOutlet UIButton *forgetMessageButton;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIButton *deactivateAcccountButton;
|
||||
|
||||
|
||||
#pragma mark - Private Properties
|
||||
|
||||
@property (strong, nonatomic) NSDictionary *normalStringAttributes;
|
||||
@property (strong, nonatomic) NSDictionary *emphasizeStringAttributes;
|
||||
|
||||
@property (strong, nonatomic) MXKErrorAlertPresentation *errorPresentation;
|
||||
|
||||
@property (weak, nonatomic) id <NSObject> themeDidChangeNotificationObserver;
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark - Implementation
|
||||
|
||||
@implementation DeactivateAccountViewController
|
||||
|
||||
#pragma mark - Setup & Teardown
|
||||
|
||||
+ (DeactivateAccountViewController*)instantiateWithMatrixSession:(MXSession*)matrixSession
|
||||
{
|
||||
DeactivateAccountViewController* viewController = [[UIStoryboard storyboardWithName:NSStringFromClass([DeactivateAccountViewController class]) bundle:[NSBundle mainBundle]] instantiateInitialViewController];
|
||||
[viewController addMatrixSession:matrixSession];
|
||||
return viewController;
|
||||
}
|
||||
|
||||
- (void)destroy
|
||||
{
|
||||
id<NSObject> notificationObserver = self.themeDidChangeNotificationObserver;
|
||||
|
||||
if (notificationObserver)
|
||||
{
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:notificationObserver];
|
||||
}
|
||||
|
||||
[super destroy];
|
||||
}
|
||||
|
||||
|
||||
#pragma mark - View life cycle
|
||||
|
||||
- (void)viewDidLoad
|
||||
{
|
||||
[super viewDidLoad];
|
||||
// Do any additional setup after loading the view.
|
||||
|
||||
self.title = NSLocalizedStringFromTable(@"deactivate_account_title", @"Vector", nil);
|
||||
|
||||
self.errorPresentation = [[MXKErrorAlertPresentation alloc] init];
|
||||
[self setupStringAttributes];
|
||||
[self setupViews];
|
||||
[self userInterfaceThemeDidChange];
|
||||
[self registerThemeNotification];
|
||||
}
|
||||
|
||||
- (void)viewWillAppear:(BOOL)animated
|
||||
{
|
||||
[super viewWillAppear:animated];
|
||||
|
||||
// Screen tracking
|
||||
[[AppDelegate theDelegate] trackScreen:@"DeactivateAccount"];
|
||||
}
|
||||
|
||||
- (void)viewDidLayoutSubviews
|
||||
{
|
||||
[super viewDidLayoutSubviews];
|
||||
|
||||
[self.deactivateAcccountButton.layer setCornerRadius:kButtonCornerRadius];
|
||||
}
|
||||
|
||||
- (UIStatusBarStyle)preferredStatusBarStyle
|
||||
{
|
||||
return kRiotDesignStatusBarStyle;
|
||||
}
|
||||
|
||||
#pragma mark - Private
|
||||
|
||||
- (void)registerThemeNotification
|
||||
{
|
||||
self.themeDidChangeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kRiotDesignValuesDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
|
||||
[self userInterfaceThemeDidChange];
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)userInterfaceThemeDidChange
|
||||
{
|
||||
self.view.backgroundColor = kRiotPrimaryBgColor;
|
||||
self.defaultBarTintColor = kRiotSecondaryBgColor;
|
||||
self.activityIndicator.backgroundColor = kRiotOverlayColor;
|
||||
}
|
||||
|
||||
- (void)setupStringAttributes
|
||||
{
|
||||
self.normalStringAttributes = @{
|
||||
NSFontAttributeName: [UIFont systemFontOfSize:kTextFontSize],
|
||||
NSForegroundColorAttributeName: kRiotPrimaryTextColor
|
||||
};
|
||||
|
||||
|
||||
self.emphasizeStringAttributes = @{
|
||||
NSFontAttributeName: [UIFont systemFontOfSize:kTextFontSize weight:UIFontWeightBold],
|
||||
NSForegroundColorAttributeName: kRiotPrimaryTextColor
|
||||
};
|
||||
}
|
||||
|
||||
- (void)setupViews
|
||||
{
|
||||
[self setupNavigationBar];
|
||||
[self setupDeactivateAcccountButton];
|
||||
[self setupDeactivateAccountInfosLabel];
|
||||
[self setupForgetMessagesInfoLabel];
|
||||
}
|
||||
|
||||
- (void)setupNavigationBar
|
||||
{
|
||||
self.navigationController.navigationBar.titleTextAttributes = @{ NSForegroundColorAttributeName: kRiotColorRed };
|
||||
|
||||
UIBarButtonItem *cancelBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil) style:UIBarButtonItemStylePlain target:self action:@selector(cancelButtonAction:)];
|
||||
self.navigationItem.rightBarButtonItem = cancelBarButtonItem;
|
||||
}
|
||||
|
||||
- (void)setupDeactivateAcccountButton
|
||||
{
|
||||
// Adjust button font size for small devices
|
||||
self.deactivateAcccountButton.titleLabel.adjustsFontSizeToFitWidth = YES;
|
||||
self.deactivateAcccountButton.titleLabel.minimumScaleFactor = 0.5;
|
||||
self.deactivateAcccountButton.titleLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
|
||||
|
||||
self.deactivateAcccountButton.layer.masksToBounds = YES;
|
||||
self.deactivateAcccountButton.backgroundColor = kRiotColorGreen;
|
||||
[self.deactivateAcccountButton setTitle:NSLocalizedStringFromTable(@"deactivate_account_validate_action", @"Vector", nil) forState:UIControlStateNormal];
|
||||
[self.deactivateAcccountButton setTitleColor:kRiotColorSilver forState:UIControlStateDisabled];
|
||||
}
|
||||
|
||||
- (void)setupDeactivateAccountInfosLabel
|
||||
{
|
||||
NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init];
|
||||
|
||||
[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part1", @"Vector", nil) attributes:self.normalStringAttributes]];
|
||||
|
||||
[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part2_emphasize", @"Vector", nil) attributes:self.emphasizeStringAttributes]];
|
||||
|
||||
[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part3", @"Vector", nil) attributes:self.normalStringAttributes]];
|
||||
|
||||
[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part4_emphasize", @"Vector", nil) attributes:self.emphasizeStringAttributes]];
|
||||
|
||||
[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_informations_part5", @"Vector", nil) attributes:self.normalStringAttributes]];
|
||||
|
||||
[self.deactivateAccountInfosLabel setAttributedText:attributedString];
|
||||
}
|
||||
|
||||
- (void)setupForgetMessagesInfoLabel
|
||||
{
|
||||
NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init];
|
||||
|
||||
[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_forget_messages_information_part1", @"Vector", nil) attributes:self.normalStringAttributes]];
|
||||
|
||||
[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_forget_messages_information_part2_emphasize", @"Vector", nil) attributes:self.emphasizeStringAttributes]];
|
||||
|
||||
[attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"deactivate_account_forget_messages_information_part3", @"Vector", nil) attributes:self.normalStringAttributes]];
|
||||
|
||||
[self.forgetMessagesInfoLabel setAttributedText:attributedString];
|
||||
}
|
||||
|
||||
- (void)enableUserActions:(BOOL)enableUserActions
|
||||
{
|
||||
self.navigationItem.rightBarButtonItem.enabled = enableUserActions;
|
||||
self.forgetMessageButton.enabled = enableUserActions;
|
||||
self.deactivateAcccountButton.enabled = enableUserActions;
|
||||
}
|
||||
|
||||
- (void)presentPasswordRequiredAlertWithSubmitHandler:(void (^)(NSString *password))submitHandler
|
||||
cancelHandler:(dispatch_block_t)cancelHandler
|
||||
{
|
||||
UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"deactivate_account_password_alert_title", @"Vector", nil)
|
||||
message:NSLocalizedStringFromTable(@"deactivate_account_password_alert_message", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
|
||||
|
||||
[alert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
|
||||
textField.secureTextEntry = YES;
|
||||
textField.placeholder = nil;
|
||||
textField.keyboardType = UIKeyboardTypeDefault;
|
||||
}];
|
||||
|
||||
[alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
|
||||
style:UIAlertActionStyleCancel
|
||||
handler:^(UIAlertAction * action) {
|
||||
if (cancelHandler)
|
||||
{
|
||||
cancelHandler();
|
||||
}
|
||||
}]];
|
||||
|
||||
__weak typeof(self) weakSelf = self;
|
||||
|
||||
[alert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"submit"]
|
||||
style:UIAlertActionStyleDefault
|
||||
handler:^(UIAlertAction * action) {
|
||||
UITextField *textField = alert.textFields.firstObject;
|
||||
|
||||
typeof(weakSelf) strongSelf = weakSelf;
|
||||
|
||||
if (strongSelf)
|
||||
{
|
||||
NSString *password = textField.text;
|
||||
|
||||
if (submitHandler)
|
||||
{
|
||||
submitHandler(password);
|
||||
}
|
||||
}
|
||||
}]];
|
||||
|
||||
[self presentViewController:alert animated:YES completion:nil];
|
||||
}
|
||||
|
||||
- (void)deactivateAccountWithUserId:(NSString*)userId
|
||||
andPassword:(NSString*)password
|
||||
eraseAllMessages:(BOOL)eraseAllMessages
|
||||
{
|
||||
if (password && userId)
|
||||
{
|
||||
[self enableUserActions:NO];
|
||||
[self startActivityIndicator];
|
||||
|
||||
// This assumes that the homeserver requires password UI auth
|
||||
// for this endpoint. In reality it could be any UI auth.
|
||||
|
||||
__weak typeof(self) weakSelf = self;
|
||||
|
||||
NSDictionary *authParameters = @{@"user": userId,
|
||||
@"password": password,
|
||||
@"type": kMXLoginFlowTypePassword};
|
||||
|
||||
[self.mainSession deactivateAccountWithAuthParameters:authParameters eraseAccount:eraseAllMessages success:^{
|
||||
NSLog(@"[SettingsViewController] Deactivate account with success");
|
||||
|
||||
[weakSelf stopActivityIndicator];
|
||||
[weakSelf enableUserActions:YES];
|
||||
} failure:^(NSError *error) {
|
||||
|
||||
NSLog(@"[SettingsViewController] Failed to deactivate account");
|
||||
|
||||
typeof(weakSelf) strongSelf = weakSelf;
|
||||
|
||||
if (strongSelf)
|
||||
{
|
||||
[strongSelf stopActivityIndicator];
|
||||
[strongSelf enableUserActions:YES];
|
||||
[strongSelf.errorPresentation presentErrorFromViewController:strongSelf forError:error animated:YES handler:nil];
|
||||
}
|
||||
}];
|
||||
}
|
||||
else
|
||||
{
|
||||
NSLog(@"[SettingsViewController] Failed to deactivate account");
|
||||
[self.errorPresentation presentGenericErrorFromViewController:self animated:YES handler:nil];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Actions
|
||||
|
||||
- (void)cancelButtonAction:(id)sender
|
||||
{
|
||||
[self.delegate deactivateAccountViewControllerDidCancel:self];
|
||||
}
|
||||
|
||||
- (IBAction)forgetMessagesButtonAction:(UIButton*)sender
|
||||
{
|
||||
self.forgetMessageButton.selected = !self.forgetMessageButton.selected;
|
||||
}
|
||||
|
||||
- (IBAction)deactivateAccountButtonAction:(id)sender
|
||||
{
|
||||
__weak typeof(self) weakSelf = self;
|
||||
|
||||
[self presentPasswordRequiredAlertWithSubmitHandler:^(NSString *password) {
|
||||
|
||||
typeof(weakSelf) strongSelf = weakSelf;
|
||||
|
||||
if (strongSelf)
|
||||
{
|
||||
NSString *userId = strongSelf.mainSession.myUser.userId;
|
||||
[strongSelf deactivateAccountWithUserId:userId andPassword:password eraseAllMessages:strongSelf.forgetMessageButton.isEnabled];
|
||||
}
|
||||
|
||||
} cancelHandler:nil];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,130 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="IHf-2R-Nmh">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
|
||||
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--Deactivate Account View Controller-->
|
||||
<scene sceneID="qDi-ox-hHh">
|
||||
<objects>
|
||||
<viewController automaticallyAdjustsScrollViewInsets="NO" id="IHf-2R-Nmh" customClass="DeactivateAccountViewController" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="QVw-lB-bra">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OSw-nj-Wdk">
|
||||
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r6I-6D-FLD">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="641"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uaL-Wi-UcQ">
|
||||
<rect key="frame" x="20" y="15" width="335" height="426.5"/>
|
||||
<string key="text">This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.
|
||||
|
||||
Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.
|
||||
|
||||
Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.
|
||||
</string>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UBr-xR-a5z">
|
||||
<rect key="frame" x="10" y="449.5" width="44" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="44" id="3Bn-lP-a2k"/>
|
||||
<constraint firstAttribute="width" secondItem="UBr-xR-a5z" secondAttribute="height" multiplier="1:1" id="6Nd-IG-Wda"/>
|
||||
</constraints>
|
||||
<state key="normal" image="selection_untick.png"/>
|
||||
<state key="selected" image="selection_tick.png"/>
|
||||
<connections>
|
||||
<action selector="forgetMessagesButtonAction:" destination="IHf-2R-Nmh" eventType="touchUpInside" id="gbq-6b-IU4"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2AU-Ro-4rr">
|
||||
<rect key="frame" x="54" y="459.5" width="301" height="101.5"/>
|
||||
<string key="text">Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)</string>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7fz-Dy-5pc">
|
||||
<rect key="frame" x="83" y="586" width="208" height="30"/>
|
||||
<color key="backgroundColor" red="0.028153735480000001" green="0.82494870580000002" blue="0.051896891280000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="AuthenticationVCLoginButton"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="30" id="GpW-8Z-aDc"/>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="gMI-XP-i84"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
|
||||
<inset key="contentEdgeInsets" minX="30" minY="0.0" maxX="30" maxY="0.0"/>
|
||||
<state key="normal" title="Deactivate Account">
|
||||
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</state>
|
||||
<connections>
|
||||
<action selector="deactivateAccountButtonAction:" destination="IHf-2R-Nmh" eventType="touchUpInside" id="ZgL-dj-3sa"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="2AU-Ro-4rr" firstAttribute="leading" secondItem="UBr-xR-a5z" secondAttribute="trailing" id="2dA-G3-YmX"/>
|
||||
<constraint firstAttribute="trailing" secondItem="uaL-Wi-UcQ" secondAttribute="trailing" constant="20" id="3VC-8f-t4r"/>
|
||||
<constraint firstItem="7fz-Dy-5pc" firstAttribute="centerX" secondItem="r6I-6D-FLD" secondAttribute="centerX" id="ArL-9U-gev"/>
|
||||
<constraint firstItem="7fz-Dy-5pc" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="r6I-6D-FLD" secondAttribute="leading" constant="20" id="GdW-9q-ham"/>
|
||||
<constraint firstItem="UBr-xR-a5z" firstAttribute="leading" secondItem="r6I-6D-FLD" secondAttribute="leading" constant="10" id="HEu-UC-ZqJ"/>
|
||||
<constraint firstItem="2AU-Ro-4rr" firstAttribute="top" secondItem="UBr-xR-a5z" secondAttribute="top" constant="10" id="Je8-yX-RL7"/>
|
||||
<constraint firstItem="7fz-Dy-5pc" firstAttribute="top" secondItem="2AU-Ro-4rr" secondAttribute="bottom" constant="25" id="Rie-CJ-sjU"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="7fz-Dy-5pc" secondAttribute="trailing" constant="20" id="aBJ-Qh-98C"/>
|
||||
<constraint firstItem="uaL-Wi-UcQ" firstAttribute="top" secondItem="r6I-6D-FLD" secondAttribute="top" constant="15" id="gNW-9W-tWy"/>
|
||||
<constraint firstItem="uaL-Wi-UcQ" firstAttribute="leading" secondItem="r6I-6D-FLD" secondAttribute="leading" constant="20" id="hkc-Mh-1eX"/>
|
||||
<constraint firstAttribute="bottom" secondItem="7fz-Dy-5pc" secondAttribute="bottom" constant="25" id="pcJ-cW-k1P"/>
|
||||
<constraint firstItem="2AU-Ro-4rr" firstAttribute="trailing" secondItem="uaL-Wi-UcQ" secondAttribute="trailing" id="unG-rW-hIH"/>
|
||||
<constraint firstItem="UBr-xR-a5z" firstAttribute="top" secondItem="uaL-Wi-UcQ" secondAttribute="bottom" constant="8" id="ygz-iG-BYI"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="r6I-6D-FLD" secondAttribute="trailing" id="Cv8-1O-u62"/>
|
||||
<constraint firstItem="r6I-6D-FLD" firstAttribute="width" secondItem="OSw-nj-Wdk" secondAttribute="width" id="LbL-Rk-YWQ"/>
|
||||
<constraint firstItem="r6I-6D-FLD" firstAttribute="top" secondItem="OSw-nj-Wdk" secondAttribute="top" id="bWG-YM-ufd"/>
|
||||
<constraint firstAttribute="bottom" secondItem="r6I-6D-FLD" secondAttribute="bottom" id="eTa-ak-f7f"/>
|
||||
<constraint firstItem="r6I-6D-FLD" firstAttribute="leading" secondItem="OSw-nj-Wdk" secondAttribute="leading" id="jDI-GL-r0a"/>
|
||||
</constraints>
|
||||
</scrollView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="HwH-O8-jKY" firstAttribute="top" secondItem="OSw-nj-Wdk" secondAttribute="top" id="0VJ-Ig-2ed"/>
|
||||
<constraint firstItem="HwH-O8-jKY" firstAttribute="leading" secondItem="OSw-nj-Wdk" secondAttribute="leading" id="Hc0-LV-lRt"/>
|
||||
<constraint firstItem="HwH-O8-jKY" firstAttribute="trailing" secondItem="OSw-nj-Wdk" secondAttribute="trailing" id="slf-Q8-PKr"/>
|
||||
<constraint firstItem="HwH-O8-jKY" firstAttribute="bottom" secondItem="OSw-nj-Wdk" secondAttribute="bottom" id="vr6-Pc-AP8"/>
|
||||
</constraints>
|
||||
<viewLayoutGuide key="safeArea" id="HwH-O8-jKY"/>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="deactivateAcccountButton" destination="7fz-Dy-5pc" id="DMS-cL-nZT"/>
|
||||
<outlet property="deactivateAccountInfosLabel" destination="uaL-Wi-UcQ" id="zDZ-bW-s0Z"/>
|
||||
<outlet property="forgetMessageButton" destination="UBr-xR-a5z" id="NfP-c4-AxP"/>
|
||||
<outlet property="forgetMessagesInfoLabel" destination="2AU-Ro-4rr" id="tTS-bh-g58"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="dTx-N1-Ytz" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-239.19999999999999" y="103.89805097451276"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
<image name="selection_tick.png" width="22" height="22"/>
|
||||
<image name="selection_untick.png" width="22" height="22"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
@ -34,6 +34,7 @@
|
|||
|
||||
#import "CountryPickerViewController.h"
|
||||
#import "LanguagePickerViewController.h"
|
||||
#import "DeactivateAccountViewController.h"
|
||||
|
||||
#import "NBPhoneNumberUtil.h"
|
||||
#import "RageShakeManager.h"
|
||||
|
|
@ -62,6 +63,7 @@ enum
|
|||
SETTINGS_SECTION_CRYPTOGRAPHY_INDEX,
|
||||
SETTINGS_SECTION_FLAIR_INDEX,
|
||||
SETTINGS_SECTION_DEVICES_INDEX,
|
||||
SETTINGS_SECTION_DEACTIVATE_ACCOUNT_INDEX,
|
||||
SETTINGS_SECTION_COUNT
|
||||
};
|
||||
|
||||
|
|
@ -130,7 +132,7 @@ enum {
|
|||
typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
||||
|
||||
|
||||
@interface SettingsViewController ()
|
||||
@interface SettingsViewController () <DeactivateAccountViewControllerDelegate>
|
||||
{
|
||||
// Current alert (if any).
|
||||
UIAlertController *currentAlert;
|
||||
|
|
@ -234,6 +236,8 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
*/
|
||||
@property (nonatomic) BOOL newPhoneEditingEnabled;
|
||||
|
||||
@property (weak, nonatomic) DeactivateAccountViewController *deactivateAccountViewController;
|
||||
|
||||
@end
|
||||
|
||||
@implementation SettingsViewController
|
||||
|
|
@ -258,6 +262,9 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
|
||||
self.navigationItem.title = NSLocalizedStringFromTable(@"settings_title", @"Vector", nil);
|
||||
|
||||
// Remove back bar button title when pushing a view controller
|
||||
self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
|
||||
|
||||
[self.tableView registerClass:MXKTableViewCellWithLabelAndTextField.class forCellReuseIdentifier:[MXKTableViewCellWithLabelAndTextField defaultReuseIdentifier]];
|
||||
[self.tableView registerClass:MXKTableViewCellWithLabelAndSwitch.class forCellReuseIdentifier:[MXKTableViewCellWithLabelAndSwitch defaultReuseIdentifier]];
|
||||
[self.tableView registerClass:MXKTableViewCellWithLabelAndMXKImageView.class forCellReuseIdentifier:[MXKTableViewCellWithLabelAndMXKImageView defaultReuseIdentifier]];
|
||||
|
|
@ -311,6 +318,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(onSave:)];
|
||||
self.navigationItem.rightBarButtonItem.accessibilityIdentifier=@"SettingsVCNavBarSaveButton";
|
||||
|
||||
|
||||
// Observe user interface theme change.
|
||||
kRiotDesignValuesDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kRiotDesignValuesDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
|
||||
|
||||
|
|
@ -1268,6 +1276,10 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
count = CRYPTOGRAPHY_COUNT;
|
||||
}
|
||||
}
|
||||
else if (section == SETTINGS_SECTION_DEACTIVATE_ACCOUNT_INDEX)
|
||||
{
|
||||
count = 1;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
|
|
@ -2151,6 +2163,32 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
cell = exportKeysBtnCell;
|
||||
}
|
||||
}
|
||||
else if (section == SETTINGS_SECTION_DEACTIVATE_ACCOUNT_INDEX)
|
||||
{
|
||||
MXKTableViewCellWithButton *deactivateAccountBtnCell = [tableView dequeueReusableCellWithIdentifier:[MXKTableViewCellWithButton defaultReuseIdentifier]];
|
||||
|
||||
if (!deactivateAccountBtnCell)
|
||||
{
|
||||
deactivateAccountBtnCell = [[MXKTableViewCellWithButton alloc] init];
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fix https://github.com/vector-im/riot-ios/issues/1354
|
||||
deactivateAccountBtnCell.mxkButton.titleLabel.text = nil;
|
||||
}
|
||||
|
||||
NSString *btnTitle = NSLocalizedStringFromTable(@"settings_deactivate_my_account", @"Vector", nil);
|
||||
[deactivateAccountBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
|
||||
[deactivateAccountBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
|
||||
[deactivateAccountBtnCell.mxkButton setTintColor:kRiotColorRed];
|
||||
deactivateAccountBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
|
||||
|
||||
[deactivateAccountBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
|
||||
[deactivateAccountBtnCell.mxkButton addTarget:self action:@selector(deactivateAccountAction) forControlEvents:UIControlEventTouchUpInside];
|
||||
deactivateAccountBtnCell.mxkButton.accessibilityIdentifier = nil;
|
||||
|
||||
cell = deactivateAccountBtnCell;
|
||||
}
|
||||
|
||||
return cell;
|
||||
}
|
||||
|
|
@ -2228,6 +2266,18 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
return NSLocalizedStringFromTable(@"settings_cryptography", @"Vector", nil);
|
||||
}
|
||||
}
|
||||
else if (section == SETTINGS_SECTION_CRYPTOGRAPHY_INDEX)
|
||||
{
|
||||
// Check whether this section is visible
|
||||
if (self.mainSession.crypto)
|
||||
{
|
||||
return NSLocalizedStringFromTable(@"settings_cryptography", @"Vector", nil);
|
||||
}
|
||||
}
|
||||
else if (section == SETTINGS_SECTION_DEACTIVATE_ACCOUNT_INDEX)
|
||||
{
|
||||
return NSLocalizedStringFromTable(@"settings_deactivate_my_account", @"Vector", nil);
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
|
@ -3673,6 +3723,20 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
[self presentViewController:themePicker animated:YES completion:nil];
|
||||
}
|
||||
|
||||
- (void)deactivateAccountAction
|
||||
{
|
||||
DeactivateAccountViewController *deactivateAccountViewController = [DeactivateAccountViewController instantiateWithMatrixSession:self.mainSession];
|
||||
|
||||
UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:deactivateAccountViewController];
|
||||
navigationController.modalPresentationStyle = UIModalPresentationFormSheet;
|
||||
|
||||
[self presentViewController:navigationController animated:YES completion:nil];
|
||||
|
||||
deactivateAccountViewController.delegate = self;
|
||||
|
||||
self.deactivateAccountViewController = deactivateAccountViewController;
|
||||
}
|
||||
|
||||
#pragma mark - MediaPickerViewController Delegate
|
||||
|
||||
- (void)dismissMediaPicker
|
||||
|
|
@ -4033,4 +4097,20 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
|
|||
[self refreshSettings];
|
||||
}
|
||||
|
||||
#pragma mark - DeactivateAccountViewControllerDelegate
|
||||
|
||||
- (void)deactivateAccountViewControllerDidDeactivateWithSuccess:(DeactivateAccountViewController *)deactivateAccountViewController
|
||||
{
|
||||
NSLog(@"[SettingsViewController] Deactivate account with success");
|
||||
|
||||
[[AppDelegate theDelegate] logoutWithCompletion:^(BOOL isLoggedOut) {
|
||||
NSLog(@"[SettingsViewController] Complete clear user data after account deactivation");
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)deactivateAccountViewControllerDidCancel:(DeactivateAccountViewController *)deactivateAccountViewController
|
||||
{
|
||||
[deactivateAccountViewController dismissViewControllerAnimated:YES completion:nil];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
Loading…
Reference in a new issue