From b3289f2b8db9cbe812df23e2b32580b575477894 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Fri, 15 Mar 2024 21:43:05 +0530 Subject: [PATCH] Remove (kindof) unused reloadWindow IPC We now bundle the renderer code within the app. So a load-fail indicates something really wrong, not something we can deal with upfront (the code wasn't probably even working - e.g. it was assigning to a function parameter mainWindow, not the actual global var behind it). --- desktop/build/error.html | 30 ------------------------------ desktop/src/api/system.ts | 4 ---- desktop/src/preload.ts | 2 -- desktop/src/utils/createWindow.ts | 10 ---------- desktop/src/utils/ipcComms.ts | 7 ------- 5 files changed, 53 deletions(-) delete mode 100644 desktop/build/error.html diff --git a/desktop/build/error.html b/desktop/build/error.html deleted file mode 100644 index cf1ea149d..000000000 --- a/desktop/build/error.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - ente Photos - - - -
-
-
- Site unreachable, please try again later -
- -
-
- - diff --git a/desktop/src/api/system.ts b/desktop/src/api/system.ts index 4f068169f..11e52d055 100644 --- a/desktop/src/api/system.ts +++ b/desktop/src/api/system.ts @@ -1,10 +1,6 @@ import { ipcRenderer } from "electron"; import { AppUpdateInfo } from "../types"; -export const reloadWindow = () => { - ipcRenderer.send("reload-window"); -}; - export const registerUpdateEventListener = ( showUpdateDialog: (updateInfo: AppUpdateInfo) => void, ) => { diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts index dee5a2063..e60fe91e6 100644 --- a/desktop/src/preload.ts +++ b/desktop/src/preload.ts @@ -55,7 +55,6 @@ import { muteUpdateNotification, registerForegroundEventListener, registerUpdateEventListener, - reloadWindow, skipAppUpdate, updateAndRestart, } from "./api/system"; @@ -327,7 +326,6 @@ contextBridge.exposeInMainWorld("ElectronAPIs", { saveFileToDisk, selectDirectory, clearElectronStore, - reloadWindow, readTextFile, showUploadFilesDialog, showUploadDirsDialog, diff --git a/desktop/src/utils/createWindow.ts b/desktop/src/utils/createWindow.ts index b481d8d31..11f05f8c1 100644 --- a/desktop/src/utils/createWindow.ts +++ b/desktop/src/utils/createWindow.ts @@ -52,16 +52,6 @@ export const createWindow = async () => { ); mainWindow.loadURL(rendererURL); } - mainWindow.webContents.on("did-fail-load", () => { - splash.close(); - isDev - ? mainWindow.loadFile(`../resources/error.html`) - : splash.loadURL( - `file://${path.join(process.resourcesPath, "error.html")}`, - ); - mainWindow.maximize(); - mainWindow.show(); - }); mainWindow.once("ready-to-show", async () => { try { splash.destroy(); diff --git a/desktop/src/utils/ipcComms.ts b/desktop/src/utils/ipcComms.ts index c64123439..83dafeb78 100644 --- a/desktop/src/utils/ipcComms.ts +++ b/desktop/src/utils/ipcComms.ts @@ -26,7 +26,6 @@ import { generateImageThumbnail, } from "../services/imageProcessor"; import { logErrorSentry } from "../services/sentry"; -import { createWindow } from "./createWindow"; import { generateTempFilePath } from "./temp"; export default function setupIpcComs( @@ -43,12 +42,6 @@ export default function setupIpcComs( } }); - ipcMain.on("reload-window", async () => { - const secondWindow = await createWindow(); - mainWindow.destroy(); - mainWindow = secondWindow; - }); - ipcMain.handle("show-upload-files-dialog", async () => { const files = await dialog.showOpenDialog({ properties: ["openFile", "multiSelections"],