diff --git a/src/components/views/voip/CallPreview.js b/src/components/views/voip/CallPreview.js
index 57bf35a719..049dd8a3c6 100644
--- a/src/components/views/voip/CallPreview.js
+++ b/src/components/views/voip/CallPreview.js
@@ -40,7 +40,7 @@ export default createReactClass({
};
},
- componentWillMount: function() {
+ componentDidMount: function() {
this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
this.dispatcherRef = dis.register(this._onAction);
},
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0e9aa3c83f..24a6568d82 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,8 +1,17 @@
{
"This email address is already in use": "This email address is already in use",
"This phone number is already in use": "This phone number is already in use",
+ "Use Single Sign On to continue": "Use Single Sign On to continue",
+ "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirm adding this email address by using Single Sign On to prove your identity.",
+ "Single Sign On": "Single Sign On",
+ "Confirm adding email": "Confirm adding email",
+ "Click the button below to confirm adding this email address.": "Click the button below to confirm adding this email address.",
+ "Confirm": "Confirm",
"Add Email Address": "Add Email Address",
"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",
+ "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirm adding this phone number by using Single Sign On to prove your identity.",
+ "Confirm adding phone number": "Confirm adding phone number",
+ "Click the button below to confirm adding this phone number.": "Click the button below to confirm adding this phone number.",
"Add Phone Number": "Add Phone Number",
"The platform you're on": "The platform you're on",
"The version of Riot": "The version of Riot",
@@ -599,6 +608,10 @@
"up to date": "up to date",
"Your homeserver does not support session management.": "Your homeserver does not support session management.",
"Unable to load session list": "Unable to load session list",
+ "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Confirm deleting these sessions by using Single Sign On to prove your identity.",
+ "Confirm deleting these sessions": "Confirm deleting these sessions",
+ "Click the button below to confirm deleting these sessions.": "Click the button below to confirm deleting these sessions.",
+ "Delete sessions": "Delete sessions",
"Authentication": "Authentication",
"Delete %(count)s sessions|other": "Delete %(count)s sessions",
"Delete %(count)s sessions|one": "Delete %(count)s session",
@@ -1862,7 +1875,6 @@
"Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
"Enter username": "Enter username",
"Email (optional)": "Email (optional)",
- "Confirm": "Confirm",
"Phone (optional)": "Phone (optional)",
"Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
"Create your Matrix account on
": "Create your Matrix account on
",
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 14257af014..69939d0f32 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -109,6 +109,7 @@ export default class EventIndex extends EventEmitter {
roomId: room.roomId,
token: token,
direction: "b",
+ fullCrawl: true,
};
const forwardCheckpoint = {
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index eea995cfea..9fb6358c1f 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -30,26 +30,6 @@ import ActiveWidgetStore from "../stores/ActiveWidgetStore";
import {IntegrationManagers} from "../integrations/IntegrationManagers";
import {Capability} from "../widgets/WidgetApi";
-/**
- * Encodes a URI according to a set of template variables. Variables will be
- * passed through encodeURIComponent.
- * @param {string} pathTemplate The path with template variables e.g. '/foo/$bar'.
- * @param {Object} variables The key/value pairs to replace the template
- * variables with. E.g. { '$bar': 'baz' }.
- * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
- */
-function encodeUri(pathTemplate, variables) {
- for (const key in variables) {
- if (!variables.hasOwnProperty(key)) {
- continue;
- }
- pathTemplate = pathTemplate.replace(
- key, encodeURIComponent(variables[key]),
- );
- }
- return pathTemplate;
-}
-
export default class WidgetUtils {
/* Returns true if user is able to send state events to modify widgets in this room
* (Does not apply to non-room-based / user widgets)
@@ -402,18 +382,6 @@ export default class WidgetUtils {
}
static makeAppConfig(appId, app, senderUserId, roomId, eventId) {
- const myUserId = MatrixClientPeg.get().credentials.userId;
- const user = MatrixClientPeg.get().getUser(myUserId);
- const params = {
- '$matrix_user_id': myUserId,
- '$matrix_room_id': roomId,
- '$matrix_display_name': user ? user.displayName : myUserId,
- '$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',
-
- // TODO: Namespace themes through some standard
- '$theme': SettingsStore.getValue("theme"),
- };
-
if (!senderUserId) {
throw new Error("Widgets must be created by someone - provide a senderUserId");
}
@@ -423,32 +391,6 @@ export default class WidgetUtils {
app.eventId = eventId;
app.name = app.name || app.type;
- if (app.type === 'jitsi') {
- console.log("Replacing Jitsi widget URL with local wrapper");
- if (!app.data || !app.data.conferenceId) {
- // Assumed to be a v1 widget: add a data object for visibility on the wrapper
- // TODO: Remove this once mobile supports v2 widgets
- console.log("Replacing v1 Jitsi widget with v2 equivalent");
- const parsed = new URL(app.url);
- app.data = {
- conferenceId: parsed.searchParams.get("confId"),
- domain: "jitsi.riot.im", // v1 widgets have this hardcoded
- };
- }
-
- app.url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
- }
-
- if (app.data) {
- Object.keys(app.data).forEach((key) => {
- params['$' + key] = app.data[key];
- });
-
- app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
- }
-
- app.url = encodeUri(app.url, params);
-
return app;
}
@@ -462,7 +404,6 @@ export default class WidgetUtils {
// widgets from at all, but it probably makes sense for sanity.
if (appType === 'jitsi') {
capWhitelist.push(Capability.AlwaysOnScreen);
- capWhitelist.push(Capability.GetRiotWebConfig);
}
return capWhitelist;
diff --git a/src/verification.js b/src/verification.js
index 2231346478..3170eb8825 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -99,7 +99,7 @@ export async function legacyVerifyUser(user) {
return;
}
const cli = MatrixClientPeg.get();
- const verificationRequestPromise = cli.beginKeyVerification(user.userId);
+ const verificationRequestPromise = cli.requestVerification(user.userId);
dis.dispatch({
action: "set_right_panel_phase",
phase: RIGHT_PANEL_PHASES.EncryptionPanel,
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index d6d1c79a99..05237d258f 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -23,7 +23,6 @@ export enum Capability {
Screenshot = "m.capability.screenshot",
Sticker = "m.sticker",
AlwaysOnScreen = "m.always_on_screen",
- GetRiotWebConfig = "im.vector.web.riot_config",
}
export enum KnownWidgetActions {
@@ -34,7 +33,6 @@ export enum KnownWidgetActions {
UpdateVisibility = "visibility",
ReceiveOpenIDCredentials = "openid_credentials",
SetAlwaysOnScreen = "set_always_on_screen",
- GetRiotWebConfig = "im.vector.web.riot_config",
ClientReady = "im.vector.ready",
}
@@ -157,12 +155,4 @@ export class WidgetApi {
resolve(); // SetAlwaysOnScreen is currently fire-and-forget, but that could change.
});
}
-
- public getRiotConfig(): Promise
{
- return new Promise(resolve => {
- this.callAction(KnownWidgetActions.GetRiotWebConfig, {}, response => {
- resolve(response.response.config);
- });
- });
- }
}
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 870d7f0aab..5e21f729d0 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -134,7 +134,7 @@ describe.skip('RoomSettings', () => {
});
});
- // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentWillMount`
+ // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentDidMount`
xit('should set room directory publicity when set to true', (done) => {
const isRoomPublished = true;
roomSettings.setState({
diff --git a/yarn.lock b/yarn.lock
index c5fc8268a1..acd474ffd7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5691,7 +5691,7 @@ mathml-tag-names@^2.0.1:
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "5.2.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/223d37ffce674a23ca73702f04b9ba31cfd84196"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/934ed37fdc90948273d7da3ec9f8728195c78a63"
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"