1 files changed, 12 insertions, 1 deletions

diff --git a/src/index.js b/src/index.js
index 594097288..e5f678759 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,6 +37,7 @@ import Tray from './lib/Tray';
 import Settings from './electron/Settings';
 import handleDeepLink from './electron/deepLinking';
 import { isPositionValid } from './electron/windowUtils';
+// import askFormacOSPermissions from './electron/macOSPermissions';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
@@ -46,10 +47,14 @@ import {
 } from './config';
 import { asarPath } from './helpers/asar-helpers';
 import { isValidExternalURL } from './helpers/url-helpers';
-/* eslint-enable import/first */
+import userAgent from './helpers/userAgent-helpers';
 
 const debug = require('debug')('Ferdi:App');
 
+// Globally set useragent to fix user agent override in service workers
+debug('Set userAgent to ', userAgent());
+app.userAgentFallback = userAgent();
+
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
@@ -182,6 +187,7 @@ const createWindow = () => {
       nodeIntegration: true,
       webviewTag: true,
       preload: path.join(__dirname, 'sentry.js'),
+      enableRemoteModule: true,
     },
   });
 
@@ -291,6 +297,11 @@ const createWindow = () => {
     }
   });
 
+  // Asking for permissions like this currently crashes Ferdi
+  // if (isMac) {
+  //   askFormacOSPermissions();
+  // }
+
   mainWindow.on('show', () => {
     debug('Skip taskbar: true');
     mainWindow.setSkipTaskbar(false);