paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-04 05:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid use of null when accessing electron.remote.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-03-31 15:14:06 -07:00
parent b07995c3ed
commit 9c25807b99
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/common/config-util.ts
View File

@@ -7,24 +7,14 @@ import {JsonDB} from "node-json-db";
import * as EnterpriseUtil from "./enterprise-util"; import * as EnterpriseUtil from "./enterprise-util";
import Logger from "./logger-util"; import Logger from "./logger-util";
/* To make the util runnable in both main and renderer process */
const {app, dialog} = process.type === "renderer" ? electron.remote : electron;
const logger = new Logger({ const logger = new Logger({
file: "config-util.log", file: "config-util.log",
timestamp: true, timestamp: true,
}); });
let dialog: Electron.Dialog = null;
let app: Electron.App = null;
/* To make the util runnable in both main and renderer process */
if (process.type === "renderer") {
const {remote} = electron;
dialog = remote.dialog;
app = remote.app;
} else {
dialog = electron.dialog;
app = electron.app;
}
let db: JsonDB; let db: JsonDB;
reloadDB(); reloadDB();

3
app/common/default-util.ts
View File

@@ -1,7 +1,8 @@
import electron from "electron"; import electron from "electron";
import fs from "fs"; import fs from "fs";
const app = process.type === "renderer" ? electron.remote.app : electron.app; const {app} = process.type === "renderer" ? electron.remote : electron;
let setupCompleted = false; let setupCompleted = false;
const zulipDir = app.getPath("userData"); const zulipDir = app.getPath("userData");

7
app/common/logger-util.ts
View File

@@ -6,6 +6,8 @@ import os from "os";
import {initSetUp} from "./default-util"; import {initSetUp} from "./default-util";
import {sentryInit, captureException} from "./sentry-util"; import {sentryInit, captureException} from "./sentry-util";
const {app} = process.type === "renderer" ? electron.remote : electron;
interface LoggerOptions { interface LoggerOptions {
timestamp?: true | (() => string); timestamp?: true | (() => string);
file?: string; file?: string;
@@ -15,11 +17,8 @@ interface LoggerOptions {
initSetUp(); initSetUp();
let app: Electron.App = null;
let reportErrors = true; let reportErrors = true;
if (process.type === "renderer") { if (process.type === "renderer") {
app = electron.remote.app;
// Report Errors to Sentry only if it is enabled in settings // Report Errors to Sentry only if it is enabled in settings
// Gets the value of reportErrors from config-util for renderer process // Gets the value of reportErrors from config-util for renderer process
// For main process, sentryInit() is handled in index.js // For main process, sentryInit() is handled in index.js
@@ -34,8 +33,6 @@ if (process.type === "renderer") {
} }
}, },
); );
} else {
app = electron.app;
} }
const logDir = `${app.getPath("userData")}/Logs`; const logDir = `${app.getPath("userData")}/Logs`;