imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split out avatar and display name hiding

Browse source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-11-13 12:58:10 -07:00
parent ffecb82bca
commit 63bebe9dfd
5 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/settings/Settings.js
View file

@ -102,9 +102,14 @@ export const SETTINGS = {
displayName: _td('Hide join/leave messages (invites/kicks/bans unaffected)'),
default: false,
},
"hideAvatarDisplaynameChanges": {
"hideAvatarChanges": {
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
displayName: _td('Hide avatar and display name changes'),
displayName: _td('Hide avatar changes'),
default: false,
},
"hideDisplaynameChanges": {
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
displayName: _td('Hide display name changes'),
default: false,
},
"hideReadReceipts": {

11
src/settings/handlers/AccountSettingsHandler.js
View file

@ -29,7 +29,16 @@ export default class AccountSettingHandler extends SettingsHandler {
return !content['disable'];
}
return this._getSettings()[settingName];
let preferredValue = this._getSettings()[settingName];
if (preferredValue === null || preferredValue === undefined) {
// Honour the old setting on read only
if (settingName === "hideAvatarChanges" || settingName === "hideDisplaynameChanges") {
preferredValue = this._getSettings()["hideAvatarDisplaynameChanges"]
}
}
return preferredValue;
}
setValue(settingName, roomId, newValue) {