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

fix race between setting canonical alias and creating aliases

Browse source
This commit is contained in:
Matthew Hodgson 2016-09-16 18:01:14 +01:00
parent 67565f88fa
commit 08543a66c4
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/components/views/room_settings/AliasSettings.js
View file

@ -70,22 +70,6 @@ module.exports = React.createClass({
saveSettings: function() { saveSettings: function() {
var promises = []; var promises = [];
// save new canonical alias
var oldCanonicalAlias = null;
if (this.props.canonicalAliasEvent) {
oldCanonicalAlias = this.props.canonicalAliasEvent.getContent().alias;
}
if (oldCanonicalAlias !== this.state.canonicalAlias) {
console.log("AliasSettings: Updating canonical alias");
promises.push(
MatrixClientPeg.get().sendStateEvent(
this.props.roomId, "m.room.canonical_alias", {
alias: this.state.canonicalAlias
}, ""
)
);
}
// save new aliases for m.room.aliases // save new aliases for m.room.aliases
var aliasOperations = this.getAliasOperations(); var aliasOperations = this.getAliasOperations();
for (var i = 0; i < aliasOperations.length; i++) { for (var i = 0; i < aliasOperations.length; i++) {
@ -111,6 +95,23 @@ module.exports = React.createClass({
} }
} }
// save new canonical alias
var oldCanonicalAlias = null;
if (this.props.canonicalAliasEvent) {
oldCanonicalAlias = this.props.canonicalAliasEvent.getContent().alias;
}
if (oldCanonicalAlias !== this.state.canonicalAlias) {
console.log("AliasSettings: Updating canonical alias");
promises = [ q.all(promises).then(
MatrixClientPeg.get().sendStateEvent(
this.props.roomId, "m.room.canonical_alias", {
alias: this.state.canonicalAlias
}, ""
)
) ];
}
return promises; return promises;
}, },