diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7901062b89..e5515f1015 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Changes in [2.6.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.1) (2020-05-22)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.6.0...v2.6.1)
+
+ * Fix key backup restore with SSSS
+ [\#4617](https://github.com/matrix-org/matrix-react-sdk/pull/4617)
+ * Remove SSSS key upgrade check from rageshake
+ [\#4616](https://github.com/matrix-org/matrix-react-sdk/pull/4616)
+
Changes in [2.6.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.0) (2020-05-19)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.6.0-rc.1...v2.6.0)
diff --git a/package.json b/package.json
index 440fe3beac..f429921fea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
- "version": "2.6.0",
+ "version": "2.6.1",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
diff --git a/src/BasePlatform.js b/src/BasePlatform.ts
similarity index 80%
rename from src/BasePlatform.js
rename to src/BasePlatform.ts
index e3cbc4dcf0..d4a6c34daf 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.ts
@@ -1,5 +1,3 @@
-// @flow
-
/*
Copyright 2016 Aviral Dasgupta
Copyright 2016 OpenMarket Ltd
@@ -19,9 +17,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import {MatrixClient} from "matrix-js-sdk";
+import {MatrixClient} from "matrix-js-sdk/src/client";
import dis from './dispatcher/dispatcher';
import BaseEventIndexManager from './indexing/BaseEventIndexManager';
+import {ActionPayload} from "./dispatcher/payloads";
/**
* Base class for classes that provide platform-specific functionality
@@ -29,27 +28,25 @@ import BaseEventIndexManager from './indexing/BaseEventIndexManager';
*
* Instances of this class are provided by the application.
*/
-export default class BasePlatform {
- constructor() {
- this.notificationCount = 0;
- this.errorDidOccur = false;
+export default abstract class BasePlatform {
+ protected notificationCount = 0;
+ protected errorDidOccur = false;
- dis.register(this._onAction.bind(this));
+ constructor() {
+ dis.register(this.onAction);
}
- _onAction(payload: Object) {
+ protected onAction = (payload: ActionPayload) => {
switch (payload.action) {
case 'on_client_not_viable':
case 'on_logged_out':
this.setNotificationCount(0);
break;
}
- }
+ };
// Used primarily for Analytics
- getHumanReadableName(): string {
- return 'Base Platform';
- }
+ abstract getHumanReadableName(): string;
setNotificationCount(count: number) {
this.notificationCount = count;
@@ -84,22 +81,17 @@ export default class BasePlatform {
* that is 'granted' if the user allowed the request or
* 'denied' otherwise.
*/
- requestNotificationPermission(): Promise<string> {
- }
+ abstract requestNotificationPermission(): Promise<string>;
- displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
- }
+ abstract displayNotification(title: string, msg: string, avatarUrl: string, room: Object);
loudNotification(ev: Event, room: Object) {
- }
+ };
/**
- * Returns a promise that resolves to a string representing
- * the current version of the application.
+ * Returns a promise that resolves to a string representing the current version of the application.
*/
- getAppVersion(): Promise<string> {
- throw new Error("getAppVersion not implemented!");
- }
+ abstract getAppVersion(): Promise<string>;
/*
* If it's not expected that capturing the screen will work
@@ -114,20 +106,18 @@ export default class BasePlatform {
* Restarts the application, without neccessarily reloading
* any application code
*/
- reload() {
- throw new Error("reload not implemented!");
- }
+ abstract reload();
supportsAutoLaunch(): boolean {
return false;
}
// XXX: Surely this should be a setting like any other?
- async getAutoLaunchEnabled(): boolean {
+ async getAutoLaunchEnabled(): Promise<boolean> {
return false;
}
- async setAutoLaunchEnabled(enabled: boolean): void {
+ async setAutoLaunchEnabled(enabled: boolean): Promise<void> {
throw new Error("Unimplemented");
}
@@ -135,11 +125,11 @@ export default class BasePlatform {
return false;
}
- async getAutoHideMenuBarEnabled(): boolean {
+ async getAutoHideMenuBarEnabled(): Promise<boolean> {
return false;
}
- async setAutoHideMenuBarEnabled(enabled: boolean): void {
+ async setAutoHideMenuBarEnabled(enabled: boolean): Promise<void> {
throw new Error("Unimplemented");
}
@@ -147,11 +137,11 @@ export default class BasePlatform {
return false;
}
- async getMinimizeToTrayEnabled(): boolean {
+ async getMinimizeToTrayEnabled(): Promise<boolean> {
return false;
}
- async setMinimizeToTrayEnabled(enabled: boolean): void {
+ async setMinimizeToTrayEnabled(enabled: boolean): Promise<void> {
throw new Error("Unimplemented");
}
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 1e5002419d..e4290f87d9 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -44,6 +44,7 @@ import {RoomListStoreTempProxy} from "../../../stores/room-list/RoomListStoreTem
import {DefaultTagID} from "../../../stores/room-list/models";
import * as Unread from "../../../Unread";
import RoomViewStore from "../../../stores/RoomViewStore";
+import {TAG_DM} from "../../../stores/RoomListStore";
const HIDE_CONFERENCE_CHANS = true;
const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.ts
similarity index 97%
rename from src/indexing/BaseEventIndexManager.js
rename to src/indexing/BaseEventIndexManager.ts
index f780c8e9ce..c40d1300ea 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.ts
@@ -1,5 +1,5 @@
/*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ export interface MatrixEvent {
content: {};
event_id: string;
origin_server_ts: number;
- unsigned: ?{};
+ unsigned?: {};
room_id: string;
}
@@ -59,7 +59,7 @@ export interface SearchArgs {
before_limit: number;
after_limit: number;
order_by_recency: boolean;
- room_id: ?string;
+ room_id?: string;
}
export interface EventAndProfile {
@@ -85,7 +85,7 @@ export interface IndexStats {
*
* Instances of this class are provided by the application.
*/
-export default class BaseEventIndexManager {
+export default abstract class BaseEventIndexManager {
/**
* Does our EventIndexManager support event indexing.
*
@@ -119,7 +119,7 @@ export default class BaseEventIndexManager {
* @return {Promise} A promise that will resolve when the was queued up for
* addition.
*/
- async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<> {
+ async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<void> {
throw new Error("Unimplemented");
}
@@ -188,7 +188,7 @@ export default class BaseEventIndexManager {
events: [EventAndProfile],
checkpoint: CrawlerCheckpoint | null,
oldCheckpoint: CrawlerCheckpoint | null,
- ): Promise<bool> {
+ ): Promise<boolean> {
throw new Error("Unimplemented");
}
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index 89b4dc2dc1..e963ecd736 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -59,7 +59,7 @@ export default class ToastStore extends EventEmitter {
const oldIndex = this.toasts.findIndex(t => t.key === newToast.key);
if (oldIndex === -1) {
let newIndex = this.toasts.length;
- while (newIndex > 0 && this.toasts[newIndex - 1].priority > newToast.priority) --newIndex;
+ while (newIndex > 0 && this.toasts[newIndex - 1].priority < newToast.priority) --newIndex;
this.toasts.splice(newIndex, 0, newToast);
} else {
this.toasts[oldIndex] = newToast;
diff --git a/yarn.lock b/yarn.lock
index 340d0b4454..40bc55f1ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5765,7 +5765,7 @@ mathml-tag-names@^2.0.1:
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "6.1.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e3c6a0e1a08a3812ba988e60eb5a2a013bb27404"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a4a7097c103da42075f2c70e070fd01fa6fb0d48"
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"