matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-13 08:02:38 +03:00
Code Activity

oops

Browse Source
This commit is contained in:
Matthew Hodgson
2017-01-21 17:43:46 +00:00
parent 3071fc0ddc
commit c618880af9
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/RoomSettings.js
View File

@@ -516,16 +516,19 @@ module.exports = React.createClass({
if (!isEncrypted && if (!isEncrypted &&
roomState.mayClientSendStateEvent("m.room.encryption", cli)) { roomState.mayClientSendStateEvent("m.room.encryption", cli)) {
return ( return (
<div>
<label> <label>
<input type="checkbox" ref="encrypt" onClick={ this.onEnableEncryptionClick }/> <input type="checkbox" ref="encrypt" onClick={ this.onEnableEncryptionClick }/>
<img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" /> <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" />
Enable encryption (warning: cannot be disabled again!) Enable encryption (warning: cannot be disabled again!)
</label> </label>
{ settings } { settings }
</div>
); );
} }
else { else {
return ( return (
<div>
<label> <label>
{ isEncrypted { isEncrypted
? <img className="mx_RoomSettings_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" /> ? <img className="mx_RoomSettings_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" />
@@ -534,6 +537,7 @@ module.exports = React.createClass({
Encryption is { isEncrypted ? "" : "not " } enabled in this room. Encryption is { isEncrypted ? "" : "not " } enabled in this room.
</label> </label>
{ settings } { settings }
</div>
); );
} }
}, },