Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Suppress warnings

Browse source
This commit is contained in:
ismailgulek 2020-08-18 17:38:52 +03:00
parent a52f27f77f
commit 1976fc1906
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Riot/Modules/Room/Settings/RoomSettingsViewController.m
View file

@ -1090,22 +1090,22 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
self->actualDirectoryVisibility = directoryVisibility;
// Update the value of the displayed toggle button (if any)
if (directoryVisibilitySwitch)
if (self->directoryVisibilitySwitch)
{
// Check a potential user's change before the end of the request
MXRoomDirectoryVisibility modifiedDirectoryVisibility = updatedItemsDict[kRoomSettingsDirectoryKey];
MXRoomDirectoryVisibility modifiedDirectoryVisibility = self->updatedItemsDict[kRoomSettingsDirectoryKey];
if (modifiedDirectoryVisibility)
{
if ([modifiedDirectoryVisibility isEqualToString:directoryVisibility])
{
// The requested change corresponds to the actual settings
[updatedItemsDict removeObjectForKey:kRoomSettingsDirectoryKey];
[self->updatedItemsDict removeObjectForKey:kRoomSettingsDirectoryKey];
[self getNavigationItem].rightBarButtonItem.enabled = (updatedItemsDict.count != 0);
[self getNavigationItem].rightBarButtonItem.enabled = (self->updatedItemsDict.count != 0);
}
}
directoryVisibilitySwitch.on = ([directoryVisibility isEqualToString:kMXRoomDirectoryVisibilityPublic]);
self->directoryVisibilitySwitch.on = ([directoryVisibility isEqualToString:kMXRoomDirectoryVisibilityPublic]);
}
}

15
Riot/Modules/Settings/SettingsViewController.m
View file

@ -164,11 +164,12 @@ SecureBackupSetupCoordinatorBridgePresenterDelegate,
SignOutAlertPresenterDelegate,
SingleImagePickerPresenterDelegate,
SettingsDiscoveryTableViewSectionDelegate, SettingsDiscoveryViewModelCoordinatorDelegate,
SettingsIdentityServerCoordinatorBridgePresenterDelegate>
SettingsIdentityServerCoordinatorBridgePresenterDelegate,
TableViewSectionsDelegate>
{
// Current alert (if any).
UIAlertController *currentAlert;
// listener
id removedAccountObserver;
id accountUserInfoObserver;
@ -809,8 +810,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
[self.tableView beginUpdates];
// Refresh the corresponding table view cell with animation
NSIndexPath *addEmailIndexPath = [_tableViewSections exactIndexPathForRowTag:USER_SETTINGS_ADD_EMAIL_INDEX
sectionTag:SECTION_TAG_USER_SETTINGS];
NSIndexPath *addEmailIndexPath = [self->_tableViewSections exactIndexPathForRowTag:USER_SETTINGS_ADD_EMAIL_INDEX
sectionTag:SECTION_TAG_USER_SETTINGS];
if (addEmailIndexPath)
{
[self.tableView reloadRowsAtIndexPaths:@[addEmailIndexPath] withRowAnimation:UITableViewRowAnimationFade];
@ -840,8 +841,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
[self.tableView beginUpdates];
// Refresh the corresponding table view cell with animation
NSIndexPath *addPhoneIndexPath = [_tableViewSections exactIndexPathForRowTag:USER_SETTINGS_ADD_PHONENUMBER_INDEX
sectionTag:SECTION_TAG_USER_SETTINGS];
NSIndexPath *addPhoneIndexPath = [self->_tableViewSections exactIndexPathForRowTag:USER_SETTINGS_ADD_PHONENUMBER_INDEX
sectionTag:SECTION_TAG_USER_SETTINGS];
if (addPhoneIndexPath)
{
[self.tableView reloadRowsAtIndexPaths:@[addPhoneIndexPath] withRowAnimation:UITableViewRowAnimationFade];
@ -3715,7 +3716,7 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
MXKAccount* account = [MXKAccountManager sharedManager].activeAccounts.firstObject;
[account changePassword:currentPasswordTextField.text with:newPasswordTextField1.text success:^{
[account changePassword:self->currentPasswordTextField.text with:self->newPasswordTextField1.text success:^{
if (weakSelf)
{