gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-09-19 17:54:39 +01:00
parent e008d7cbeb ab3f1f829a
commit 6bd089c350
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
Changes in [1.3.6](https://github.com/vector-im/riot-web/releases/tag/v1.3.6) (2019-09-19)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.5...v1.3.6)
* Fix origin migrator for SSO logins
[\#10920](https://github.com/vector-im/riot-web/pull/10920)
Changes in [1.3.5](https://github.com/vector-im/riot-web/releases/tag/v1.3.5) (2019-09-16) Changes in [1.3.5](https://github.com/vector-im/riot-web/releases/tag/v1.3.5) (2019-09-16)
========================================================================================== ==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.5-rc.3...v1.3.5) [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.5-rc.3...v1.3.5)

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.3.5", "version": "1.3.6",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"dependencies": { "dependencies": {

18
electron_app/src/originMigrator.js
View File

@ -33,7 +33,11 @@ async function migrateFromOldOrigin() {
webgl: false, webgl: false,
}, },
}); });
ipcMain.on('origin_migration_complete', (e, success, sentSummary, storedSummary) => { const onOriginMigrationComplete = (e, success, sentSummary, storedSummary) => {
// we use once but we'll only get one of these events,
// so remove the listener for the other one
ipcMain.removeListener('origin_migration_nodata', onOriginMigrationNoData);
if (success) { if (success) {
console.log("Origin migration completed successfully!"); console.log("Origin migration completed successfully!");
} else { } else {
@ -43,12 +47,18 @@ async function migrateFromOldOrigin() {
console.error("Data stored", storedSummary); console.error("Data stored", storedSummary);
migrateWindow.close(); migrateWindow.close();
resolve(); resolve();
}); };
ipcMain.on('origin_migration_nodata', (e) => { const onOriginMigrationNoData = (e, success, sentSummary, storedSummary) => {
ipcMain.removeListener('origin_migration_complete', onOriginMigrationComplete);
console.log("No session to migrate from old origin"); console.log("No session to migrate from old origin");
migrateWindow.close(); migrateWindow.close();
resolve(); resolve();
}); };
ipcMain.once('origin_migration_complete', onOriginMigrationComplete);
ipcMain.once('origin_migration_nodata', onOriginMigrationNoData);
// Normalise the path because in the distribution, __dirname will be inside the // Normalise the path because in the distribution, __dirname will be inside the
// electron asar. // electron asar.
const sourcePagePath = path.normalize(__dirname + '/../../origin_migrator/source.html'); const sourcePagePath = path.normalize(__dirname + '/../../origin_migrator/source.html');

2
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "electron_app/src/electron-main.js", "main": "electron_app/src/electron-main.js",
"version": "1.3.5", "version": "1.3.6",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"repository": { "repository": {