potentially fix misinput issues

Author: Pietrodjaowjao

AuthFix/AndroidKeyboardGuard.cs

@@ -1,4 +1,5 @@
-using BepInEx;
+using AmongUs.Data;
+using BepInEx;
 using BepInEx.Configuration;
 using BepInEx.Unity.IL2CPP;
 using BepInEx.Unity.IL2CPP.Utils.Collections;
@@ -42,6 +43,8 @@ public partial class AuthPlugin : BasePlugin
     private static bool _ranLobbyJoin;
     private static bool _useKeyboard;
 
+    internal static bool UseKeyboardMode => Instance?.KeyboardMode?.Value ?? _useKeyboard;
+
     public static string GetLobby()
     {
         return Marshal.PtrToStringUTF8(get_lobby()) ?? string.Empty;
@@ -204,54 +207,48 @@ static class ActiveInputManager_LastControllerPatch
     {
         public static bool Prefix()
         {
-            if (!_useKeyboard)
+            if (!UseKeyboardMode)
             {
                 return true;
             }
 
-            if (ActiveInputManager.Instance.lastUsedController != null)
-            {
-                ActiveInputManager.Instance.lastUsedController = null;
-            }
-            AndroidKeyboardGuard.ForceKeyboardMode();
             return false;
         }
     }
 
     [HarmonyPatch(typeof(ActiveInputManager), nameof(ActiveInputManager.UpdateActiveControlType))]
     static class ActiveInputManager_UpdatePatch
     {
-        public static void Postfix()
+        public static bool Prefix()
         {
-            if (!_useKeyboard)
+            if (!UseKeyboardMode)
             {
-                return;
+                return true;
             }
 
-            if (AndroidKeyboardGuard.ShouldUseKeyboardControls())
+            ActiveInputManager.InputType inputType = ActiveInputManager.InputType.Keyboard;
+            if (inputType != ActiveInputManager.currentControlType)
             {
-                if (ActiveInputManager.Instance.lastUsedController != null)
+                ActiveInputManager.CurrentInputSourceChanged?.Invoke();
+                if (HudManager.InstanceExists)
                 {
-                    ActiveInputManager.Instance.lastUsedController = null;
+                    HudManager.Instance.SetTouchType(ControlTypes.Keyboard);
                 }
-
-                AndroidKeyboardGuard.ForceKeyboardMode();
             }
+            return false;
         }
     }
 
-    [HarmonyPatch(typeof(ActiveInputManager), "ShouldEnableTouch")]
+    [HarmonyPatch(typeof(ActiveInputManager), nameof(ActiveInputManager.ShouldEnableTouch))]
     static class ActiveInputManager_ShouldEnableTouchPatch
     {
         public static bool Prefix(ref bool __result)
         {
-            if (!_useKeyboard)
+            if (!UseKeyboardMode)
             {
                 return true;
             }
 
-            if (!AndroidKeyboardGuard.ShouldUseKeyboardControls()) return true;
-
             __result = false;
             return false;
         }
@@ -262,12 +259,12 @@ static class HudManager_SetTouchTypePatch
     {
         public static void Prefix(ref ControlTypes type)
         {
-            if (!_useKeyboard)
+            if (!UseKeyboardMode)
             {
                 return;
             }
 
-            if (AndroidKeyboardGuard.ShouldUseKeyboardControls() && type != ControlTypes.Keyboard)
+            if (type != ControlTypes.Keyboard)
                 type = ControlTypes.Keyboard;
         }
     }
@@ -277,12 +274,12 @@ static class ConsoleJoystick_SetMapEnabledPatch
     {
         public static bool Prefix()
         {
-            if (!_useKeyboard)
+            if (!UseKeyboardMode)
             {
                 return true;
             }
 
-            return !AndroidKeyboardGuard.IsKeyboardController();
+            return false;
         }
     }
 
@@ -291,12 +288,12 @@ static class ConsoleJoystick_UpdatePatch
     {
         public static bool Prefix()
         {
-            if (!_useKeyboard)
+            if (!UseKeyboardMode)
             {
                 return true;
             }
 
-            return !AndroidKeyboardGuard.ShouldUseKeyboardControls();
+            return false;
         }
     }
 
@@ -305,12 +302,12 @@ static class ControllerManager_UpdatePatch
     {
         public static bool Prefix()
         {
-            if (!_useKeyboard)
+            if (!UseKeyboardMode)
             {
                 return true;
             }
 
-            return !AndroidKeyboardGuard.ShouldUseKeyboardControls();
+            return false;
         }
     }
 
@@ -319,12 +316,12 @@ static class VirtualCursor_UpdatePatch
     {
         public static bool Prefix()
         {
-            if (!_useKeyboard)
+            if (!UseKeyboardMode)
             {
                 return true;
             }
 
-            return !AndroidKeyboardGuard.ShouldUseKeyboardControls();
+            return false;
         }
     }