felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-02 14:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug Fix - Room Settings: tap on existing room address is ignored

Browse Source 
#503
This commit is contained in:
giomfo
2016-08-26 10:34:16 +02:00
parent 22a283a9eb
commit 26620faf3e
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/RoomSettingsViewController.m
+14 -9
View File
@@ -2205,14 +2205,8 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
{
if (localAddressesCount != 0 || indexPath.row != 0)
{
// Check user's power level to know whether the user is allowed to remove room alias
MXRoomPowerLevels *powerLevels = [mxRoom.state powerLevels];
NSInteger oneSelfPowerLevel = [powerLevels powerLevelOfUserWithUserID:self.mainSession.myUser.userId];
if (oneSelfPowerLevel >= [powerLevels minimumPowerLevelForSendingEventAsStateEvent:kMXEventTypeStringRoomAliases])
{
return YES;
}
// The user is allowed to remove a room alias only if he is allowed to create alias too.
return (roomAddressNewAliasIndex != -1);
}
}
return NO;
@@ -2432,7 +2426,8 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
{
NSInteger row = (localAddressesCount ? indexPath.row : indexPath.row - 1);
if (row < roomAddresses.count)
// Ignore the selection if the user is not allowed to modify aliases.
if ((roomAddressNewAliasIndex != -1) && (row < roomAddresses.count))
{
NSString *alias = roomAddresses[row];
NSString *currentCanonicalAlias = mxRoomState.canonicalAlias;
@@ -2476,6 +2471,16 @@ NSString *const kRoomSettingsAdvancedCellViewIdentifier = @"kRoomSettingsAdvance
[self getNavigationItem].rightBarButtonItem.enabled = (updatedItemsDict.count != 0);
}
}
else
{
// Define the main room alias
[updatedItemsDict setObject:alias forKey:kRoomSettingsCanonicalAliasKey];
NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:ROOM_SETTINGS_ROOM_ADDRESSES_SECTION_INDEX];
[self.tableView reloadSections:indexSet withRowAnimation:UITableViewRowAnimationNone];
[self getNavigationItem].rightBarButtonItem.enabled = YES;
}
}
}
}