Remove the code that calls the origin migrator
This will have done its job now, everyone's had long enough to install a newer version of Riot and migrate to the new origin. Laves the code on the backend that handles it for the time being, as per comment.pull/11631/head
parent
7776b19339
commit
89d622b8b2
|
@ -232,6 +232,10 @@ ipcMain.on('ipcCall', async function(ev, payload) {
|
|||
}
|
||||
break;
|
||||
case 'origin_migrate':
|
||||
// NB. The code to call this has now been removed so this
|
||||
// should never be called. This code itself has been removed
|
||||
// with the migration to the riot-desktop repo, with the
|
||||
// expectation that this will become the new home for this code.
|
||||
migratingOrigin = true;
|
||||
await migrateFromOldOrigin();
|
||||
migratingOrigin = false;
|
||||
|
|
|
@ -191,14 +191,6 @@ async function loadApp() {
|
|||
console.log("Using Electron platform");
|
||||
const plaf = new ElectronPlatform();
|
||||
PlatformPeg.set(plaf);
|
||||
|
||||
// Electron only: see if we need to do a one-time data
|
||||
// migration
|
||||
if (window.localStorage.getItem('mx_user_id') === null) {
|
||||
console.log("Migrating session from old origin...");
|
||||
await plaf.migrateFromOldOrigin();
|
||||
console.log("Origin migration complete");
|
||||
}
|
||||
} else {
|
||||
console.log("Using Web platform");
|
||||
PlatformPeg.set(new WebPlatform());
|
||||
|
|
|
@ -355,10 +355,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
|
|||
window.location.reload(false);
|
||||
}
|
||||
|
||||
async migrateFromOldOrigin() {
|
||||
return this._ipcCall('origin_migrate');
|
||||
}
|
||||
|
||||
async _ipcCall(name, ...args) {
|
||||
const ipcCallId = ++this._nextIpcCallId;
|
||||
return new Promise((resolve, reject) => {
|
||||
|
|
|
@ -173,12 +173,4 @@ export default class VectorBasePlatform extends BasePlatform {
|
|||
getDefaultDeviceDisplayName(): string {
|
||||
return _t("Unknown device");
|
||||
}
|
||||
|
||||
/**
|
||||
* Migrate account data from a previous origin
|
||||
* Used only for the electron app
|
||||
*/
|
||||
async migrateFromOldOrigin() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue