From 3a8b741b93899c0d662150280920eedf50807c68 Mon Sep 17 00:00:00 2001
From: zt515 <kiva515@foxmail.com>
Date: Sat, 4 Nov 2017 11:39:03 +0800
Subject: [PATCH] Improve: always prevent volume keys from doing their original
 actions

---
 .../io/neoterm/frontend/client/TermViewClient.kt   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/neoterm/frontend/client/TermViewClient.kt b/app/src/main/java/io/neoterm/frontend/client/TermViewClient.kt
index a3532ed..8ea6b3f 100644
--- a/app/src/main/java/io/neoterm/frontend/client/TermViewClient.kt
+++ b/app/src/main/java/io/neoterm/frontend/client/TermViewClient.kt
@@ -52,9 +52,7 @@ class TermViewClient(val context: Context) : TerminalViewClient {
     }
 
     override fun onKeyDown(keyCode: Int, e: KeyEvent?, session: TerminalSession?): Boolean {
-        // Volume keys as special keys
-        if (NeoPreference.loadBoolean(R.string.key_general_volume_as_control, false)
-                && handleVirtualKeys(keyCode, e, true)) {
+        if (handleVirtualKeys(keyCode, e, true)) {
             return true
         }
 
@@ -196,14 +194,18 @@ class TermViewClient(val context: Context) : TerminalViewClient {
         if (event == null) {
             return false
         }
+        // Volume keys as special keys
+        val volumeAsSpecialKeys = NeoPreference.loadBoolean(R.string.key_general_volume_as_control,
+                false)
+
         val inputDevice = event.device
         if (inputDevice != null && inputDevice.keyboardType == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
             return false
         } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-            mVirtualControlKeyDown = down
+            mVirtualControlKeyDown = down && volumeAsSpecialKeys
             return true
         } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-            mVirtualFnKeyDown = down
+            mVirtualFnKeyDown = down && volumeAsSpecialKeys
             return true
         }
         return false
@@ -225,7 +227,7 @@ class TermViewClient(val context: Context) : TerminalViewClient {
         }
     }
 
-    private fun updateExtraKeysVisibility() : Boolean {
+    private fun updateExtraKeysVisibility(): Boolean {
         val extraKeysView = termData?.extraKeysView ?: return false
 
         return if (NeoPreference.loadBoolean(R.string.key_ui_eks_enabled, true)) {