mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use SignalContext instead of SignalWindow

Browse source
This commit is contained in:
Josh Perez 2021-10-07 19:28:47 -04:00 • committed by GitHub
parent a70a8a88d6
commit 75dab30367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 180 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ts/windows/permissions/preload.ts
View file

@ -5,11 +5,9 @@ import React from 'react';
import ReactDOM from 'react-dom';
import { contextBridge, ipcRenderer } from 'electron';
// It is important to call this as early as possible
import '../context';
import { SignalContext } from '../context';
import { createSetting } from '../../util/preload';
import { SignalWindow } from '../configure';
import { PermissionsPopup } from '../../components/PermissionsPopup';
const mediaCameraPermissions = createSetting('mediaCameraPermissions', {
@ -24,21 +22,21 @@ contextBridge.exposeInMainWorld(
window.SignalContext.nativeThemeListener
);
contextBridge.exposeInMainWorld('SignalWindow', {
...SignalWindow,
contextBridge.exposeInMainWorld('SignalContext', {
...SignalContext,
renderWindow: () => {
const forCalling = SignalWindow.config.forCalling === 'true';
const forCamera = SignalWindow.config.forCamera === 'true';
const forCalling = SignalContext.config.forCalling === 'true';
const forCamera = SignalContext.config.forCamera === 'true';
let message;
if (forCalling) {
if (forCamera) {
message = SignalWindow.i18n('videoCallingPermissionNeeded');
message = SignalContext.i18n('videoCallingPermissionNeeded');
} else {
message = SignalWindow.i18n('audioCallingPermissionNeeded');
message = SignalContext.i18n('audioCallingPermissionNeeded');
}
} else {
message = SignalWindow.i18n('audioPermissionNeeded');
message = SignalContext.i18n('audioPermissionNeeded');
}
function onClose() {
@ -47,7 +45,7 @@ contextBridge.exposeInMainWorld('SignalWindow', {
ReactDOM.render(
React.createElement(PermissionsPopup, {
i18n: SignalWindow.i18n,
i18n: SignalContext.i18n,
message,
onAccept: () => {
if (!forCamera) {