3 files changed, 34 insertions, 2 deletions

diff --git a/src/electron/deepLinking.js b/src/electron/deepLinking.js
new file mode 100644
index 000000000..819fdd095
--- /dev/null
+++ b/src/electron/deepLinking.js
@@ -0,0 +1,5 @@
+export default function handleDeepLink(window, url) {
+  console.log(url);
+
+  window.webContents.send('navigateFromDeepLink', { url });
+}
diff --git a/src/index.js b/src/index.js
index 6a08e5e5a..4b6241f13 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,6 +8,7 @@ import { isDevMode, isWindows } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
+import handleDeepLink from './electron/deepLinking';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
@@ -26,10 +27,18 @@ if (isWindows) {
 }
 
 // Force single window
-const isSecondInstance = app.makeSingleInstance(() => {
+const isSecondInstance = app.makeSingleInstance((argv) => {
   if (mainWindow) {
     if (mainWindow.isMinimized()) mainWindow.restore();
     mainWindow.focus();
+
+    if (process.platform === 'win32') {
+      // Keep only command line / deep linked arguments
+      const url = argv.slice(1);
+
+      console.log(url);
+      handleDeepLink(mainWindow, url);
+    }
   }
 });
 
@@ -70,7 +79,8 @@ const createWindow = () => {
   const trayIcon = new Tray();
 
   // Initialize ipcApi
-  ipcApi({ mainWindow, settings, trayIcon });
+  const franzIpcApi = ipcApi({ mainWindow, settings, trayIcon });
+  console.log(franzIpcApi);
 
   // Manage Window State
   mainWindowState.manage(mainWindow);
@@ -176,3 +186,15 @@ app.on('activate', () => {
     mainWindow.show();
   }
 });
+
+app.on('will-finish-launching', () => {
+  // Protocol handler for osx
+  app.on('open-url', (event, url) => {
+    event.preventDefault();
+    console.log(`open-url event: ${url}`);
+    handleDeepLink(mainWindow, url);
+  });
+});
+
+// Register App URL
+app.setAsDefaultProtocolClient('franz');
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 17ec832cf..557c9f7f2 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -116,6 +116,11 @@ export default class AppStore extends Store {
       }
     });
 
+    // Handle deep linking (franz://)
+    ipcRenderer.on('navigateFromDeepLink', (event, data) => {
+      console.log(event, data);
+    });
+
     // Check system idle time every minute
     setInterval(() => {
       this.idleTime = idleTimer.getIdleTime();