OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

improve device info

pull/21833/head
Matthew Hodgson 2016-09-15 02:44:55 +01:00
parent 8bda0bb095
commit ce655c7f50
3 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,23 +76,23 @@ module.exports = React.createClass({
</tr> </tr>
<tr> <tr>
<td>Sender device name</td> <td>Sender device name</td>
<td>{ device.getDisplayName() }</td> <td>{ device ? device.getDisplayName() : <i>unknown device</i>}</td>
</tr> </tr>
<tr> <tr>
<td>Sender device ID</td> <td>Sender device ID</td>
<td>{ device.deviceId }</td> <td>{ device ? <code>{ device.deviceId }</code> : <i>unknown device</i>}</td>
</tr> </tr>
<tr> <tr>
<td>Sender device verification:</td> <td>Sender device verification</td>
<td>{ MatrixClientPeg.get().isEventSenderVerified(event) ? "verified" : <b>NOT verified</b> }</td> <td>{ MatrixClientPeg.get().isEventSenderVerified(event) ? "verified" : <b>NOT verified</b> }</td>
</tr> </tr>
<tr> <tr>
<td>Sender device ed25519 identity key</td> <td>Sender device ed25519 identity key</td>
<td>{ device.getFingerprint() }</td> <td>{ device ? <code>{device.getFingerprint()}</code> : <i>unknown device</i>}</td>
</tr> </tr>
<tr> <tr>
<td>Sender device curve25519 olm key</td> <td>Sender device curve25519 olm key</td>
<td>{ event.getWireContent().sender_key }</td> <td><code>{ event.getWireContent().sender_key }</code></td>
</tr> </tr>
<tr> <tr>
<td>Algorithm</td> <td>Algorithm</td>
@ -106,6 +106,10 @@ module.exports = React.createClass({
</tr> </tr>
) : '' ) : ''
} }
<tr>
<td>Session ID</td>
<td><code>{ event.getWireContent().session_id }</code></td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>

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

@ -471,10 +471,10 @@ module.exports = React.createClass({
e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />; e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
} }
else if (this.state.verified == true || (e2eEnabled && this.props.eventSendStatus)) { else if (this.state.verified == true || (e2eEnabled && this.props.eventSendStatus)) {
e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" alt="Encrypted by a verified device"/>; e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-verified.svg" width="10" height="12"/>;
} }
else { else {
e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt="Encrypted by an unverified device!"/>; e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
} }
} }
else if (e2eEnabled) { else if (e2eEnabled) {

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

@ -87,6 +87,10 @@ export default class MemberDeviceInfo extends React.Component {
} }
render() { render() {
if (!this.props.device) {
return <div className="mx_MemberDeviceInfo"/>;
}
var indicator = null, blockButton = null, verifyButton = null; var indicator = null, blockButton = null, verifyButton = null;
if (this.props.device.isBlocked()) { if (this.props.device.isBlocked()) {
blockButton = ( blockButton = (
@ -120,36 +124,39 @@ export default class MemberDeviceInfo extends React.Component {
); );
} }
if (!this.props.hideInfo) {
if (this.props.device.isBlocked()) { if (this.props.device.isBlocked()) {
indicator = ( indicator = (
<div className="mx_MemberDeviceInfo_blocked">Blocked</div> <div className="mx_MemberDeviceInfo_blocked">
<img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt="Blocked"/>
</div>
); );
} else if (this.props.device.isVerified()) { } else if (this.props.device.isVerified()) {
indicator = ( indicator = (
<div className="mx_MemberDeviceInfo_verified">Verified</div> <div className="mx_MemberDeviceInfo_verified">
<img src="img/e2e-verified.svg" width="10" height="12" alt="Verified"/>
</div>
); );
} else { } else {
indicator = ( indicator = (
<div className="mx_MemberDeviceInfo_unverified">Unverified</div> <div className="mx_MemberDeviceInfo_unverified">
<img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt="Unverified"/>
</div>
); );
} }
var deviceName = this.props.device.getDisplayName() || this.props.device.deviceId; var deviceName = this.props.device.getDisplayName() || this.props.device.deviceId;
var info; var info = (
if (!this.props.hideInfo) { <div className="mx_MemberDeviceInfo_deviceInfo" title={this.props.device.deviceId}>
info = ( <div className="mx_MemberDeviceInfo_deviceId">{deviceName}{indicator}</div>
<div className="mx_MemberDeviceInfo_deviceInfo">
<div className="mx_MemberDeviceInfo_deviceId">{deviceName}</div>
{indicator}
</div> </div>
); );
} }
// add the deviceId as a titletext to help with debugging // add the deviceId as a titletext to help with debugging
return ( return (
<div className="mx_MemberDeviceInfo" title={this.props.device.deviceId}> <div className="mx_MemberDeviceInfo">
{ info } { info }
{ verifyButton } { verifyButton }
{ blockButton } { blockButton }