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

Mac: Fix signal link handling when app is not open

Browse source 
Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2024-07-12 09:59:08 -05:00 • committed by GitHub
parent 2633776aaa
commit 72a14ba9ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/main.ts
View file

@ -179,6 +179,8 @@ nativeThemeNotifier.initialize();
let appStartInitialSpellcheckSetting = true;
let macInitialOpenUrlRoute: ParsedSignalRoute | undefined;
const cliParser = createParser({
allowUnknown: true,
options: [
@ -281,10 +283,19 @@ if (!process.mas) {
return true;
});
// This event is received in macOS packaged builds.
app.on('open-url', (event, incomingHref) => {
event.preventDefault();
const route = parseSignalRoute(incomingHref);
if (route != null) {
// When the app isn't open and you click a signal link to open the app, then
// this event will emit before mainWindow is ready. We save the value for later.
if (mainWindow == null || !mainWindow.webContents) {
macInitialOpenUrlRoute = route;
return;
}
handleSignalRoute(route);
}
});
@ -1083,12 +1094,17 @@ async function readyForUpdates() {
isReadyForUpdates = true;
// First, install requested sticker pack
// First, handle requested signal URLs
const incomingHref = maybeGetIncomingSignalRoute(process.argv);
if (incomingHref) {
handleSignalRoute(incomingHref);
} else if (macInitialOpenUrlRoute) {
handleSignalRoute(macInitialOpenUrlRoute);
}
// Discard value even if we don't handle a saved URL.
macInitialOpenUrlRoute = undefined;
// Second, start checking for app updates
try {
strictAssert(