Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff

electron_app/src/electron-main.js

@@ -1,6 +1,7 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -155,6 +156,20 @@ electron.ipcMain.on('settings_set', function(ev, key, value) {
 });
 
 electron.app.on('ready', () => {
+
+    if (argv.devtools) {
+        try {
+            const { default: installExtension, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer');
+            installExtension(REACT_DEVELOPER_TOOLS)
+                .then((name) => console.log(`Added Extension: ${name}`))
+                .catch((err) => console.log('An error occurred: ', err));
+            installExtension(REACT_PERF)
+                .then((name) => console.log(`Added Extension: ${name}`))
+                .catch((err) => console.log('An error occurred: ', err));
+        } catch(e) {console.log(e);}
+    }
+
+
     if (vectorConfig.update_base_url) {
         console.log(`Starting auto update with base URL: ${vectorConfig.update_base_url}`);
         updater.start(vectorConfig.update_base_url)

electron_app/src/tray.js

@@ -16,6 +16,9 @@ limitations under the License.
 */
 
 const {app, Tray, Menu, nativeImage} = require('electron');
+const pngToIco = require('png-to-ico');
+const path = require('path');
+const fs = require('fs');
 
 let trayIcon = null;
 
@@ -57,7 +60,7 @@ exports.create = function(win, config) {
     trayIcon.on('click', toggleWin);
 
     let lastFavicon = null;
-    win.webContents.on('page-favicon-updated', function(ev, favicons) {
+    win.webContents.on('page-favicon-updated', async function(ev, favicons) {
         let newFavicon = config.icon_path;
         if (favicons && favicons.length > 0 && favicons[0].startsWith('data:')) {
             newFavicon = favicons[0];
@@ -70,6 +73,15 @@ exports.create = function(win, config) {
         // if its not default we have to construct into nativeImage
         if (newFavicon !== config.icon_path) {
             newFavicon = nativeImage.createFromDataURL(favicons[0]);
+
+            if (process.platform === 'win32') {
+                try {
+                    const icoPath = path.join(app.getPath('temp'), 'win32_riot_icon.ico')
+                    const icoBuf = await pngToIco(newFavicon.toPNG());
+                    fs.writeFileSync(icoPath, icoBuf);
+                    newFavicon = icoPath;
+                } catch (e) {console.error(e);}
+            }
         }
 
         trayIcon.setImage(newFavicon);