fix #116 by disallowing invalid accelerator keys, both on startup and…

… in Prefs UI
todbot · Jul 2, 2019 · 8216411 · 8216411
1 parent 7050f3c
commit 8216411
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/app/components/gui/preferencesModal.js b/app/components/gui/preferencesModal.js
@@ -16,6 +16,7 @@ var ControlLabel = require('react-bootstrap').ControlLabel;
 var Radio = require('react-bootstrap').Radio;
 var Checkbox = require('react-bootstrap').Checkbox;
 
+var isAccelerator = require("electron-is-accelerator");
 
 var PatternsService = require('../../server/patternsService');
 var Blink1Service   = require('../../server/blink1Service');
@@ -85,8 +86,7 @@ loadSettings: function() {
     patterns: patterns,
     patternId: 'whiteflashes',
     nonComputerPattern: patterns[0].id,
-    nonComputerStatus: '',
-    errormsg: ''
+    errorMsg: ''
   };
   return settings;
 },
@@ -185,13 +185,21 @@ handleBlink1NonComputerSet: function(event) {
     log.msg("setting pattern:",patt);
     err = Blink1Service.writePatternToBlink1(patt,true,0);
   }
-
-  this.setState({nonComputerStatus: err});
+  err = ( !err ) ? "success" : err;
+  this.setState({errorMsg: err});
 },
 handleInputChange: function(event) {
   var target = event.target;
   var value = target.type === 'checkbox' ? target.checked : target.value;
   var name = target.name;
+  if( name == 'shortcutResetKey' && value != '') {
+    var accel = this.state.shortcutPrefix +"+"+ value;
+    log.msg("accel:",accel);
+    if( !isAccelerator(accel) ) {
+      this.setState({errorMsg: "Cannot use '"+value+"' as shortcut key"});
+      return;
+    }
+  }
   this.setState({[name]: value});
 },
 
@@ -210,6 +218,7 @@ render: function() {
     paddingLeft: 15,
     paddingBottom: 10
   };
+  var errorSectStyle = { paddingLeft: 15, color:'red'}; 
 
   return (
     <div>
@@ -367,10 +376,13 @@ render: function() {
                       </Col>
                     </FormGroup>
                   </Form>
-                  <span>{this.state.nonComputerStatus}</span>
                 </div>
               </Col>
-
+            </Row>
+            <Row>
+              <Col>
+              <div style={errorSectStyle}>{this.state.errorMsg}</div>
+              </Col>
             </Row>
           </Modal.Body>
           <Modal.Footer>

diff --git a/app/main.js b/app/main.js
@@ -10,6 +10,7 @@ var Menu = electron.Menu;
 var crashReporter = electron.crashReporter;
 
 var path = require('path');
+var isAccelerator = require("electron-is-accelerator");
 
 var updater = require('./updater');
 
@@ -203,14 +204,20 @@ app.on('ready', function () {
   var globalShortcutPrefix = config.readSettings('startup:shortcutPrefix') || 'CommandOrControl+Shift';
   var resetKey = config.readSettings('startup:shortcutResetKey') || 'R';
   var resetShortcut = globalShortcutPrefix + '+' + resetKey;
+  console.log("global shortcut:", resetShortcut);
 
-  var ret = globalShortcut.register(resetShortcut, function() {
-    //   console.log('resetShortcut is pressed');
-      mainWindow.webContents.send('resetAlerts');
+  if( isAccelerator( resetShortcut)) {
+    var ret = globalShortcut.register(resetShortcut, function() {
+      //   console.log('resetShortcut is pressed');
+        mainWindow.webContents.send('resetAlerts');
     });
     if (!ret) { console.log('globalShortcut registration failed');  }
     // Check whether a shortcut is registered.
-    console.log("global shortcut key registered:", globalShortcut.isRegistered(resetShortcut));
+    console.log("globalShortcut key registered:", globalShortcut.isRegistered(resetShortcut));
+  }
+  else {
+    console.log("ignoring bad globalShortcutkey: ",resetShortcut);
+  }
 
   if( process.env.NODE_ENV === 'development' ) {
     mainWindow = new BrowserWindow({

diff --git a/app/package.json b/app/package.json
@@ -14,6 +14,7 @@
     "auto-launch": "^5.0.1",
     "d3-timer": "^1.0.7",
     "debug": "^2.2.0",
+    "electron-is-accelerator": "^0.1.2",
     "electron-log": "^3.0.6",
     "electron-updater": "^4.0.6",
     "events": "^1.1.1",