From bf2423e47103e461db5cb753ae54e07eaaa216f3 Mon Sep 17 00:00:00 2001
From: ADAS2024 <dasar-24@rhodes.edu>
Date: Sat, 9 May 2026 17:58:47 -0400
Subject: [PATCH] Commented out debug logging, added back missing TODO
 statement regarding magic numbers

---
 .../org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt   | 2 +-
 .../java/org/citra/citra_emu/fragments/EmulationFragment.kt | 1 +
 .../src/main/java/org/citra/citra_emu/utils/ComboHelper.kt  | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt
index d3f493ecd..7da3b17e0 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt
@@ -110,7 +110,7 @@ class HotkeyUtility(
     }
 
     fun handleHotkeyRelease(bindedButton: Int): Boolean {
-        Log.debug("Handling hotkey button release: " + bindedButton)
+        // Log.debug("Handling hotkey button release: " + bindedButton)
         if (bindedButton == Hotkey.COMBO_KEY.button) {
             ComboHelper.comboActivate(NativeLibrary.ButtonState.RELEASED)
         }
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
index 517c3610a..7d669c873 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
@@ -1062,6 +1062,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
             // Buttons that are disabled by default
             var defaultValue = true
             when (i) {
+                // TODO: Remove these magic numbers
                 6, 7, 12, 13, 14, 15, 16 -> defaultValue = false
             }
             enabledButtons[i] = preferences.getBoolean("buttonToggle$i", defaultValue)
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
index 002329dc9..c346b9b8a 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
@@ -10,9 +10,9 @@ import org.citra.citra_emu.features.settings.model.IntListSetting
 object ComboHelper {
     fun comboActivate(buttonStatus: Int) {
         val comboArray = IntListSetting.COMBO_KEYS.list
-        Log.info("Combo Array: $comboArray")
+        // Log.info("Combo Array: $comboArray")
         for (nativeButton in comboArray) {
-            Log.info("Native Button: $nativeButton")
+            // Log.info("Native Button: $nativeButton")
             if (nativeButton == -1)
             {
                 // We don't want to parse any bad inputs here so we continue loop
@@ -20,7 +20,7 @@ object ComboHelper {
             }
             else
             {
-                Log.debug("Handling combo button press: $nativeButton")
+                // Log.debug("Handling combo button press: $nativeButton")
                 NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, nativeButton, buttonStatus)
             }
         }