Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into kegan/syncv3

Browse source
This commit is contained in:
Kegan Dougal 2021-11-26 11:52:51 +00:00
commit 81fddc008c
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "hydrogen-web", "name": "hydrogen-web",
"version": "0.2.21", "version": "0.2.22",
"description": "A javascript matrix client prototype, trying to minize RAM usage by offloading as much as possible to IndexedDB", "description": "A javascript matrix client prototype, trying to minize RAM usage by offloading as much as possible to IndexedDB",
"main": "src/lib.ts", "main": "src/lib.ts",
"directories": { "directories": {
@ -39,7 +39,7 @@
"eslint": "^7.32.0", "eslint": "^7.32.0",
"fake-indexeddb": "^3.1.2", "fake-indexeddb": "^3.1.2",
"finalhandler": "^1.1.1", "finalhandler": "^1.1.1",
"impunity": "^1.0.3", "impunity": "^1.0.7",
"mdn-polyfills": "^5.20.0", "mdn-polyfills": "^5.20.0",
"postcss": "^8.1.1", "postcss": "^8.1.1",
"postcss-css-variables": "^0.17.0", "postcss-css-variables": "^0.17.0",

11
src/matrix/SessionContainer.js
View file

@ -329,7 +329,16 @@ export class SessionContainer {
request: this._platform.request, request: this._platform.request,
}); });
const olm = await this._olmPromise; const olm = await this._olmPromise;
const encryptedDehydratedDevice = await getDehydratedDevice(hsApi, olm, this._platform, log); let encryptedDehydratedDevice;
try {
encryptedDehydratedDevice = await getDehydratedDevice(hsApi, olm, this._platform, log);
} catch (err) {
if (err.name === "HomeServerError") {
log.set("not_supported", true);
} else {
throw err;
}
}
if (encryptedDehydratedDevice) { if (encryptedDehydratedDevice) {
let resolveStageFinish; let resolveStageFinish;
const promiseStageFinish = new Promise(r => resolveStageFinish = r); const promiseStageFinish = new Promise(r => resolveStageFinish = r);

8
yarn.lock
View file

@ -3021,10 +3021,10 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
parent-module "^1.0.0" parent-module "^1.0.0"
resolve-from "^4.0.0" resolve-from "^4.0.0"
impunity@^1.0.3: impunity@^1.0.7:
version "1.0.3" version "1.0.7"
resolved "https://registry.yarnpkg.com/impunity/-/impunity-1.0.3.tgz#1e9972d137f0e0dbed4d39e6eca6c238a29b6526" resolved "https://registry.yarnpkg.com/impunity/-/impunity-1.0.7.tgz#b1484678ca82b7fce7750ab085a418302ce5883d"
integrity sha512-D3XT8ED/AX5mbSQdAf0nz+65ilZE/q17Yykx8g7FqlnKjDdoowFv9kxdS4tOggPrJY/5lAfE86/ZFa878VpZBw== integrity sha512-DIPr9toJHP8s/SMe6efOzhfGtiCbEniPO4JtHk6CvSZqtEPZpkF31l8TUrG8XTYxU1lBFwlkFi7RZ681YWdBrQ==
dependencies: dependencies:
colors "^1.3.3" colors "^1.3.3"
commander "^6.1.0" commander "^6.1.0"