Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #574 from matrix-org/rav/s_block_blacklist

Browse Source 
s/block/blacklist for e2e
This commit is contained in:
David Baker 2016-11-29 19:09:18 +00:00 committed by GitHub
commit 03bd4b1457
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/dialogs/EncryptedEventDialog.js
View File

@ -83,7 +83,7 @@ module.exports = React.createClass({
var verificationStatus = (<b>NOT verified</b>);
if (device.isBlocked()) {
verificationStatus = (<b>Blocked</b>);
verificationStatus = (<b>Blacklisted</b>);
} else if (device.isVerified()) {
verificationStatus = "verified";
}

28
src/components/views/elements/DeviceVerifyButtons.js
View File

@ -49,7 +49,7 @@ export default React.createClass({
<p>
If it matches, press the verify button below.
If it doesnt, then someone else is intercepting this device
and you probably want to press the block button instead.
and you probably want to press the blacklist button instead.
</p>
<p>
In future this verification process will be more sophisticated.
@ -73,33 +73,33 @@ export default React.createClass({
);
},
onBlockClick: function() {
onBlacklistClick: function() {
MatrixClientPeg.get().setDeviceBlocked(
this.props.userId, this.props.device.deviceId, true
);
},
onUnblockClick: function() {
onUnblacklistClick: function() {
MatrixClientPeg.get().setDeviceBlocked(
this.props.userId, this.props.device.deviceId, false
);
},
render: function() {
var blockButton = null, verifyButton = null;
var blacklistButton = null, verifyButton = null;
if (this.props.device.isBlocked()) {
blockButton = (
<button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unblock"
onClick={this.onUnblockClick}>
Unblock
blacklistButton = (
<button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unblacklist"
onClick={this.onUnblacklistClick}>
Unblacklist
</button>
);
} else {
blockButton = (
<button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_block"
onClick={this.onBlockClick}>
Block
blacklistButton = (
<button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_blacklist"
onClick={this.onBlacklistClick}>
Blacklist
</button>
);
}
@ -115,7 +115,7 @@ export default React.createClass({
verifyButton = (
<button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_verify"
onClick={this.onVerifyClick}>
Verify
Verify...
</button>
);
}
@ -124,7 +124,7 @@ export default React.createClass({
return (
<div className="mx_MemberDeviceInfo mx_DeviceVerifyButtons" >
{ verifyButton }
{ blockButton }
{ blacklistButton }
</div>
);
},

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

@ -24,8 +24,8 @@ export default class MemberDeviceInfo extends React.Component {
if (this.props.device.isBlocked()) {
indicator = (
<div className="mx_MemberDeviceInfo_blocked">
<img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt="Blocked"/>
<div className="mx_MemberDeviceInfo_blacklisted">
<img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt="Blacklisted"/>
</div>
);
} else if (this.props.device.isVerified()) {