diff --git a/app/internal_packages/custom-sounds/lib/main.ts b/app/internal_packages/custom-sounds/lib/main.ts index 8fb68c3b57..5498434f6e 100644 --- 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 index d705963ddc..f86a6a27ac 100644 --- 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 index 9bbf73f24f..930d45e93c 100644 --- a/app/static/index.html +++ b/app/static/index.html @@ -3,7 +3,7 @@ Mailspring - +