--- a/app/src/main/java/com/five_ten_sg/connectbot/service/TerminalKeyListener.java	Sun Apr 28 18:26:39 2019 -0700
+++ b/app/src/main/java/com/five_ten_sg/connectbot/service/TerminalKeyListener.java	Mon Aug 19 11:12:40 2019 -0700
@@ -142,6 +142,13 @@
         try {
             int repeat = event.getRepeatCount();
 
+            // if keycode debugging enabled, log and print the pressed key
+            if (prefs.getBoolean(PreferenceConstants.DEBUG_KEYCODES, false)) {
+                String keyCodeString = String.format(": %d %d %d", keyCode, repeat, event.getAction());
+                String toastText = v.getContext().getString(R.string.keycode_pressed) + keyCodeString;
+                Log.d(TAG, toastText);
+            }
+
             // skip keys if we aren't connected yet or have been disconnected
             if (bridge.isDisconnected()) return false;
 
@@ -153,13 +160,6 @@
                 // There's nothing else here for virtual keyboard users.
                 if (!hardKeyboard || hardKeyboardHidden) return false;
 
-                // if keycode debugging enabled, log and print the pressed key
-                if (prefs.getBoolean(PreferenceConstants.DEBUG_KEYCODES, false)) {
-                    String keyCodeString = String.format(": %d", keyCode);
-                    String toastText = v.getContext().getString(R.string.keycode_pressed) + keyCodeString;
-                    Log.d(TAG, toastText);
-                }
-
                 if (fullKeyboard()) {
                     switch (keyCode) {
                         case KeyEvent.KEYCODE_CTRL_LEFT:
@@ -573,14 +573,14 @@
                 return (handleShortcut(v, hwbuttonShortcut, repeat, down));
 
             case KeyEvent.KEYCODE_VOLUME_UP:
-                // check to see which shortcut the volume button triggers
+                // check to see which shortcut the volume up button triggers
                 hwbuttonShortcut = manager.prefs.getString(
                                        PreferenceConstants.VOLUP,
                                        PreferenceConstants.HWBUTTON_FUNCTION_KEYS);
                 return (handleShortcut(v, hwbuttonShortcut, repeat, down));
 
             case KeyEvent.KEYCODE_VOLUME_DOWN:
-                // check to see which shortcut the camera button triggers
+                // check to see which shortcut the volume down button triggers
                 hwbuttonShortcut = manager.prefs.getString(
                                        PreferenceConstants.VOLDN,
                                        PreferenceConstants.HWBUTTON_TAB);