game menu: clean-up open on back navigation

Author: Karim Mreisi

app/src/main/java/com/limelight/Game.java

@@ -1272,8 +1272,16 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 
     @Override
     public boolean handleKeyDown(KeyEvent event) {
-        // Pass-through virtual navigation keys
+        // Handle (virtual) Navigation Keys
         if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
+            // Show Game Menu on back action instead of finishing the activity, the user has to
+            // select "Disconnect" within the game menu to actually disconnect
+            if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+                showGameMenu(null);
+                return true;
+            }
+
+            // Pass-through other navigation keys
             return false;
         }
 
@@ -2270,16 +2278,7 @@ public void showGameMenu(GameInputDevice device) {
     public boolean onKey(View view, int keyCode, KeyEvent keyEvent) {
         switch (keyEvent.getAction()) {
             case KeyEvent.ACTION_DOWN:
-                boolean handled = handleKeyDown(keyEvent);
-                if (handled)
-                    return true;
-
-                // Intercept back key event before android handles it
-                // Always handle the request, the user has to select "Disconnect" within the game menu to actually disconnect
-                if (keyCode == keyEvent.KEYCODE_BACK) {
-                    showGameMenu(null);
-                    return true;
-                }
+                return handleKeyDown(keyEvent);
             case KeyEvent.ACTION_UP:
                 return handleKeyUp(keyEvent);
             default: