+ let sasBlock;
+ if (showSAS) {
+ let button;
+ if (pending) {
+ button =
;
+ } else {
+ const disabled = this.state.emojiButtonClicked;
+ button = (
+
+ {_t("Verify by emoji")}
+
+ );
+ }
+ const sasLabel = this.state.qrCodeProps ?
+ _t("If you can't scan the code above, verify by comparing unique emoji.") :
+ _t("Verify by comparing unique emoji.");
+ sasBlock =
{_t("Verify by emoji")}
-
{_t("If you can't scan the code above, verify by comparing unique emoji.")}
-
+
{sasLabel}
{ button }
-
+
![]({require("../../../../../../res/img/warning.svg")})
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index a831505a05..4a881ae852 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -58,7 +58,7 @@ export default class VerificationRequestToast extends React.PureComponent {
_checkRequestIsPending = () => {
const {request} = this.props;
- if (request.ready || request.done || request.cancelled || request.observeOnly) {
+ if (!request.canAccept) {
ToastStore.sharedInstance().dismissToast(this.props.toastKey);
}
};
diff --git a/src/createRoom.js b/src/createRoom.js
index c25b618dc6..07eaee3e8f 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -23,6 +23,7 @@ import dis from "./dispatcher";
import * as Rooms from "./Rooms";
import DMRoomMap from "./utils/DMRoomMap";
import {getAddressType} from "./UserAddress";
+import SettingsStore from "./settings/SettingsStore";
/**
* Create a new room, and switch to it.
@@ -159,7 +160,7 @@ export default function createRoom(opts) {
});
}
-export async function ensureDMExists(client, userId) {
+export function findDMForUser(client, userId) {
const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
const rooms = roomIds.map(id => client.getRoom(id));
const suitableDMRooms = rooms.filter(r => {
@@ -169,12 +170,60 @@ export async function ensureDMExists(client, userId) {
}
return false;
});
- let roomId;
if (suitableDMRooms.length) {
- const room = suitableDMRooms[0];
- roomId = room.roomId;
+ return suitableDMRooms[0];
+ }
+}
+
+/*
+ * Try to ensure the user is already in the megolm session before continuing
+ * NOTE: this assumes you've just created the room and there's not been an opportunity
+ * for other code to run, so we shouldn't miss RoomState.newMember when it comes by.
+ */
+export async function _waitForMember(client, roomId, userId, opts = { timeout: 1500 }) {
+ const { timeout } = opts;
+ let handler;
+ return new Promise((resolve) => {
+ handler = function(_event, _roomstate, member) {
+ if (member.userId !== userId) return;
+ if (member.roomId !== roomId) return;
+ resolve(true);
+ };
+ client.on("RoomState.newMember", handler);
+
+ /* We don't want to hang if this goes wrong, so we proceed and hope the other
+ user is already in the megolm session */
+ setTimeout(resolve, timeout, false);
+ }).finally(() => {
+ client.removeListener("RoomState.newMember", handler);
+ });
+}
+
+/*
+ * Ensure that for every user in a room, there is at least one device that we
+ * can encrypt to.
+ */
+export async function canEncryptToAllUsers(client, userIds) {
+ const usersDeviceMap = await client.downloadKeys(userIds);
+ // { "@user:host": { "DEVICE": {...}, ... }, ... }
+ return Object.values(usersDeviceMap).every((userDevices) =>
+ // { "DEVICE": {...}, ... }
+ Object.keys(userDevices).length > 0,
+ );
+}
+
+export async function ensureDMExists(client, userId) {
+ const existingDMRoom = findDMForUser(client, userId);
+ let roomId;
+ if (existingDMRoom) {
+ roomId = existingDMRoom.roomId;
} else {
- roomId = await createRoom({dmUserId: userId, spinner: false, andView: false});
+ let encryption;
+ if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+ encryption = canEncryptToAllUsers(client, [userId]);
+ }
+ roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
+ await _waitForMember(client, roomId, userId);
}
return roomId;
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1f4d9829ad..04c0a7501a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -5,21 +5,22 @@
"Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
"Add Phone Number": "Add Phone Number",
"The platform you're on": "The platform you're on",
- "The version of Riot.im": "The version of Riot.im",
+ "The version of Riot": "The version of Riot",
"Whether or not you're logged in (we don't record your username)": "Whether or not you're logged in (we don't record your username)",
"Your language of choice": "Your language of choice",
"Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
"Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
- "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
"Your homeserver's URL": "Your homeserver's URL",
- "Your identity server's URL": "Your identity server's URL",
+ "Whether you're using Riot on a device where touch is the primary input mechanism": "Whether you're using Riot on a device where touch is the primary input mechanism",
+ "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
+ "Whether you're using Riot as an installed Progressive Web App": "Whether you're using Riot as an installed Progressive Web App",
"e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
"Every page you use in the app": "Every page you use in the app",
"e.g.
": "e.g. ",
- "Your User Agent": "Your User Agent",
+ "Your user agent": "Your user agent",
"Your device resolution": "Your device resolution",
"Analytics": "Analytics",
- "The information being sent to us to help make Riot.im better includes:": "The information being sent to us to help make Riot.im better includes:",
+ "The information being sent to us to help make Riot better includes:": "The information being sent to us to help make Riot better includes:",
"Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
"Error": "Error",
"Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
@@ -1198,11 +1199,12 @@
"This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
"Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
"Security": "Security",
- "Verify by emoji": "Verify by emoji",
- "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
+ "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.",
"Verify by scanning": "Verify by scanning",
"Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
+ "Verify by emoji": "Verify by emoji",
"If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
+ "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
"You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
"Got it": "Got it",
"Verification timed out. Start verification again from their profile.": "Verification timed out. Start verification again from their profile.",
@@ -1240,8 +1242,12 @@
"%(name)s cancelled verifying": "%(name)s cancelled verifying",
"You accepted": "You accepted",
"%(name)s accepted": "%(name)s accepted",
+ "You declined": "You declined",
"You cancelled": "You cancelled",
+ "%(name)s declined": "%(name)s declined",
"%(name)s cancelled": "%(name)s cancelled",
+ "accepting …": "accepting …",
+ "declining …": "declining …",
"%(name)s wants to verify": "%(name)s wants to verify",
"You sent a verification request": "You sent a verification request",
"Error decrypting video": "Error decrypting video",
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index ed5a9e5946..091f64bf93 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -67,6 +67,18 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
userAgent = window.navigator.userAgent;
}
+ let installedPWA = "UNKNOWN";
+ try {
+ // Known to work at least for desktop Chrome
+ installedPWA = window.matchMedia('(display-mode: standalone)').matches;
+ } catch (e) { }
+
+ let touchInput = "UNKNOWN";
+ try {
+ // MDN claims broad support across browsers
+ touchInput = window.matchMedia('(pointer: coarse)').matches;
+ } catch (e) { }
+
const client = MatrixClientPeg.get();
console.log("Sending bug report.");
@@ -76,6 +88,8 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
body.append('app', 'riot-web');
body.append('version', version);
body.append('user_agent', userAgent);
+ body.append('installed_pwa', installedPWA);
+ body.append('touch_input', touchInput);
if (client) {
body.append('user_id', client.credentials.userId);
diff --git a/src/usercontent/index.html b/src/usercontent/index.html
new file mode 100644
index 0000000000..90a0fe7c16
--- /dev/null
+++ b/src/usercontent/index.html
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
new file mode 100644
index 0000000000..b87ccb9dbb
--- /dev/null
+++ b/src/usercontent/index.js
@@ -0,0 +1,49 @@
+const params = window.location.search.substring(1).split('&');
+let lockOrigin;
+for (let i = 0; i < params.length; ++i) {
+ const parts = params[i].split('=');
+ if (parts[0] === 'origin') lockOrigin = decodeURIComponent(parts[1]);
+}
+
+function remoteRender(event) {
+ const data = event.data;
+
+ const img = document.createElement("img");
+ img.id = "img";
+ img.src = data.imgSrc;
+ img.style = data.imgStyle;
+
+ const a = document.createElement("a");
+ a.id = "a";
+ a.rel = "noopener";
+ a.target = "_blank";
+ a.download = data.download;
+ a.style = data.style;
+ a.style.fontFamily = "Arial, Helvetica, Sans-Serif";
+ a.href = window.URL.createObjectURL(data.blob);
+ a.appendChild(img);
+ a.appendChild(document.createTextNode(data.textContent));
+
+ const body = document.body;
+ // Don't display scrollbars if the link takes more than one line to display.
+ body.style = "margin: 0px; overflow: hidden";
+ body.appendChild(a);
+}
+
+function remoteSetTint(event) {
+ const data = event.data;
+
+ const img = document.getElementById("img");
+ img.src = data.imgSrc;
+ img.style = data.imgStyle;
+
+ const a = document.getElementById("a");
+ a.style = data.style;
+}
+
+window.onmessage = function(e) {
+ if (e.origin === lockOrigin) {
+ if (e.data.blob) remoteRender(e);
+ else remoteSetTint(e);
+ }
+};
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 59917057a5..e6332cf7f8 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -34,10 +34,15 @@ import Matrix from 'matrix-js-sdk';
const test_utils = require('../../test-utils');
const mockclock = require('../../mock-clock');
+import Adapter from "enzyme-adapter-react-16";
+import { configure, mount } from "enzyme";
+
import Velocity from 'velocity-animate';
import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
import RoomContext from "../../../src/contexts/RoomContext";
+configure({ adapter: new Adapter() });
+
let client;
const room = new Matrix.Room();
@@ -251,4 +256,111 @@ describe('MessagePanel', function() {
}, 100);
}, 100);
});
+
+ it('should collapse creation events', function() {
+ const mkEvent = test_utils.mkEvent;
+ const mkMembership = test_utils.mkMembership;
+ const roomId = "!someroom";
+ const alice = "@alice:example.org";
+ const ts0 = Date.now();
+ const events = [
+ mkEvent({
+ event: true,
+ type: "m.room.create",
+ room: roomId,
+ user: alice,
+ content: {
+ creator: alice,
+ room_version: "5",
+ predecessor: {
+ room_id: "!prevroom",
+ event_id: "$someevent",
+ },
+ },
+ ts: ts0,
+ }),
+ mkMembership({
+ event: true,
+ room: roomId,
+ user: alice,
+ target: {
+ userId: alice,
+ name: "Alice",
+ getAvatarUrl: () => {
+ return "avatar.jpeg";
+ },
+ },
+ ts: ts0 + 1,
+ mship: 'join',
+ name: 'Alice',
+ }),
+ mkEvent({
+ event: true,
+ type: "m.room.join_rules",
+ room: roomId,
+ user: alice,
+ content: {
+ "join_rule": "invite"
+ },
+ ts: ts0 + 2,
+ }),
+ mkEvent({
+ event: true,
+ type: "m.room.history_visibility",
+ room: roomId,
+ user: alice,
+ content: {
+ "history_visibility": "invited",
+ },
+ ts: ts0 + 3,
+ }),
+ mkEvent({
+ event: true,
+ type: "m.room.encryption",
+ room: roomId,
+ user: alice,
+ content: {
+ "algorithm": "m.megolm.v1.aes-sha2",
+ },
+ ts: ts0 + 4,
+ }),
+ mkMembership({
+ event: true,
+ room: roomId,
+ user: alice,
+ skey: "@bob:example.org",
+ target: {
+ userId: "@bob:example.org",
+ name: "Bob",
+ getAvatarUrl: () => {
+ return "avatar.jpeg";
+ },
+ },
+ ts: ts0 + 5,
+ mship: 'invite',
+ name: 'Bob',
+ }),
+ ];
+ const res = mount(
+ ,
+ );
+
+ // we expect that
+ // - the room creation event, the room encryption event, and Alice inviting Bob,
+ // should be outside of the room creation summary
+ // - all other events should be inside the room creation summary
+
+ const tiles = res.find(sdk.getComponent('views.rooms.EventTile'));
+
+ expect(tiles.at(0).props().mxEvent.getType()).toEqual("m.room.create");
+ expect(tiles.at(1).props().mxEvent.getType()).toEqual("m.room.encryption");
+
+ const summaryTiles = res.find(sdk.getComponent('views.elements.EventListSummary'));
+ const summaryTile = summaryTiles.at(0);
+
+ const summaryEventTiles = summaryTile.find(sdk.getComponent('views.rooms.EventTile'));
+ // every event except for the room creation, room encryption, and Bob's
+ // invite event should be in the event summary
+ expect(summaryEventTiles.length).toEqual(tiles.length - 3);
+ });
});
diff --git a/test/createRoom-test.js b/test/createRoom-test.js
new file mode 100644
index 0000000000..f7e8617c3f
--- /dev/null
+++ b/test/createRoom-test.js
@@ -0,0 +1,72 @@
+import {_waitForMember, canEncryptToAllUsers} from '../src/createRoom';
+import {EventEmitter} from 'events';
+
+/* Shorter timeout, we've got tests to run */
+const timeout = 30;
+
+describe("waitForMember", () => {
+ let client;
+
+ beforeEach(() => {
+ client = new EventEmitter();
+ });
+
+ it("resolves with false if the timeout is reached", (done) => {
+ _waitForMember(client, "", "", { timeout: 0 }).then((r) => {
+ expect(r).toBe(false);
+ done();
+ });
+ });
+
+ it("resolves with false if the timeout is reached, even if other RoomState.newMember events fire", (done) => {
+ const roomId = "!roomId:domain";
+ const userId = "@clientId:domain";
+ _waitForMember(client, roomId, userId, { timeout }).then((r) => {
+ expect(r).toBe(false);
+ done();
+ });
+ client.emit("RoomState.newMember", undefined, undefined, { roomId, userId: "@anotherClient:domain" });
+ });
+
+ it("resolves with true if RoomState.newMember fires", (done) => {
+ const roomId = "!roomId:domain";
+ const userId = "@clientId:domain";
+ _waitForMember(client, roomId, userId, { timeout }).then((r) => {
+ expect(r).toBe(true);
+ expect(client.listeners("RoomState.newMember").length).toBe(0);
+ done();
+ });
+ client.emit("RoomState.newMember", undefined, undefined, { roomId, userId });
+ });
+});
+
+describe("canEncryptToAllUsers", () => {
+ const trueUser = {
+ "@goodUser:localhost": {
+ "DEV1": {},
+ "DEV2": {},
+ },
+ };
+ const falseUser = {
+ "@badUser:localhost": {},
+ };
+
+ it("returns true if all devices have crypto", async (done) => {
+ const client = {
+ downloadKeys: async function(userIds) { return trueUser; },
+ };
+ const response = await canEncryptToAllUsers(client, ["@goodUser:localhost"]);
+ expect(response).toBe(true);
+ done();
+ });
+
+
+ it("returns false if not all users have crypto", async (done) => {
+ const client = {
+ downloadKeys: async function(userIds) { return {...trueUser, ...falseUser}; },
+ };
+ const response = await canEncryptToAllUsers(client, ["@goodUser:localhost", "@badUser:localhost"]);
+ expect(response).toBe(false);
+ done();
+ });
+});
diff --git a/test/test-utils.js b/test/test-utils.js
index fdd50a8792..d7aa9d5de9 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -51,7 +51,7 @@ export function createTestClient() {
getUserId: jest.fn().mockReturnValue("@userId:matrix.rog"),
getPushActionsForEvent: jest.fn(),
- getRoom: jest.fn().mockReturnValue(mkStubRoom()),
+ getRoom: jest.fn().mockImplementation(mkStubRoom),
getRooms: jest.fn().mockReturnValue([]),
getVisibleRooms: jest.fn().mockReturnValue([]),
getGroups: jest.fn().mockReturnValue([]),
@@ -111,7 +111,7 @@ export function mkEvent(opts) {
if (opts.skey) {
event.state_key = opts.skey;
} else if (["m.room.name", "m.room.topic", "m.room.create", "m.room.join_rules",
- "m.room.power_levels", "m.room.topic",
+ "m.room.power_levels", "m.room.topic", "m.room.history_visibility", "m.room.encryption",
"com.example.state"].indexOf(opts.type) !== -1) {
event.state_key = "";
}
diff --git a/yarn.lock b/yarn.lock
index b892ac44f6..1ed39459d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,9 +5760,10 @@ mathml-tag-names@^2.0.1:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "4.0.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/21e4c597d9633aef606871cf9ffffaf039142be3"
+matrix-js-sdk@5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.0.0.tgz#dcbab35f1afdb35ef0364eb232e78e0fb7dc2a5b"
+ integrity sha512-A/aeE2Zn2OHq1n/9wIHCszrQZ7oXfThUHWi5Kz7illVCPUJ3JrZ31XVvx02k6vBasDcUtjAfZblHdTVN62cWLw==
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"