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

Merge pull request #16 from matrix-org/markjh/end-to-end

Browse source 
Add basic support for end-to-end crypto using olm.
This commit is contained in:
David Baker 2015-07-21 13:21:43 -07:00
commit e03809b224
6 changed files with 101 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/controllers/organisms/CreateRoom.js
View file

@ -19,6 +19,8 @@ limitations under the License.
var React = require("react");
var MatrixClientPeg = require("../../MatrixClientPeg");
var PresetValues = require('../atoms/create_room/Presets').Presets;
var q = require('q');
var encryption = require("../../encryption");
module.exports = {
propTypes: {
@ -97,7 +99,20 @@ module.exports = {
return;
}
var deferred = MatrixClientPeg.get().createRoom(options);
var deferred = cli.createRoom(options);
var response;
if (this.state.encrypt) {
deferred = deferred.then(function(res) {
response = res;
return encryption.enableEncryption(
cli, response.roomId, options.invite
);
}).then(function() {
return q(response) }
);
}
this.setState({
phase: this.phases.CREATING,