Allow mailspring:// for sounds / other media elements

Foundry376 · Jul 29, 2023 · 2b75347 · 2b75347
1 parent 31a8b59
commit 2b75347
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/app/internal_packages/custom-sounds/lib/main.ts b/app/internal_packages/custom-sounds/lib/main.ts
@@ -1,15 +1,10 @@
 import { SoundRegistry } from 'mailspring-exports';
 
 export function activate() {
-  // FIXME: Use the mailspring:// protocol handlers once we upgrade Electron past
-  // v30.0
-  // See: https://github.com/atom/electron/issues/1123
-  SoundRegistry.register({
-    send: ['internal_packages', 'custom-sounds', 'CUSTOM_UI_Send_v1.ogg'],
-    confirm: ['internal_packages', 'custom-sounds', 'CUSTOM_UI_Confirm_v1.ogg'],
-    'hit-send': ['internal_packages', 'custom-sounds', 'CUSTOM_UI_HitSend_v1.ogg'],
-    'new-mail': ['internal_packages', 'custom-sounds', 'CUSTOM_UI_NewMail_v1.ogg'],
-  });
+  SoundRegistry.register('send', 'mailspring://custom-sounds/CUSTOM_UI_Send_v1.ogg');
+  SoundRegistry.register('confirm', 'mailspring://custom-sounds/CUSTOM_UI_Confirm_v1.ogg');
+  SoundRegistry.register('hit-send', 'mailspring://custom-sounds/CUSTOM_UI_HitSend_v1.ogg');
+  SoundRegistry.register('new-mail', 'mailspring://custom-sounds/CUSTOM_UI_NewMail_v1.ogg');
 }
 
 export function deactivate() {

diff --git a/app/src/browser/main.js b/app/src/browser/main.js
@@ -352,7 +352,7 @@ const start = () => {
         responseHeaders: {
           ...details.responseHeaders,
           'Content-Security-Policy': [
-            "default-src * mailspring:; script-src 'self' 'unsafe-inline' chrome-extension://react-developer-tools; style-src * 'unsafe-inline' mailspring:; img-src * data: mailspring: file:; object-src none; media-src none; manifest-src none;",
+            "default-src * mailspring:; script-src 'self' 'unsafe-inline' chrome-extension://react-developer-tools; style-src * 'unsafe-inline' mailspring:; img-src * data: mailspring: file:; object-src none; media-src mailspring:; manifest-src none;",
           ],
         },
       });

diff --git a/app/static/index.html b/app/static/index.html
@@ -3,7 +3,7 @@
 <head>
   <title>Mailspring</title>
 
-  <meta http-equiv="Content-Security-Policy" content="default-src * mailspring:; script-src 'self' chrome-extension://react-developer-tools; style-src * 'unsafe-inline' mailspring:; img-src * data: mailspring: file:; object-src none; media-src none; manifest-src none;">
+  <meta http-equiv="Content-Security-Policy" content="default-src * mailspring:; script-src 'self' chrome-extension://react-developer-tools; style-src * 'unsafe-inline' mailspring:; img-src * data: mailspring: file:; object-src none; media-src mailspring:; manifest-src none;">
 
   <script src="index.js"></script>
 </head>