Merge pull request ddnet#8784 from Robyt3/Android-Backbutton-Handling…

…-Revert Revert "Quit if Android back-button is pressed 3 times within 1 second"
Robyt3 · Aug 21, 2024 · fe9c2d3 · fe9c2d3
2 parents 4dc7346 + 499ad48
commit fe9c2d3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 31 deletions.
diff --git a/src/engine/client/input.cpp b/src/engine/client/input.cpp
@@ -712,35 +712,9 @@ int CInput::Update()
 
 		// handle keys
 		case SDL_KEYDOWN:
-#if defined(CONF_PLATFORM_ANDROID)
-			if(Event.key.keysym.scancode == KEY_AC_BACK && m_BackButtonReleased)
-			{
-				if(m_LastBackPress == -1 || (Now - m_LastBackPress) / (float)time_freq() > 1.0f)
-				{
-					m_NumBackPresses = 1;
-					m_LastBackPress = Now;
-				}
-				else
-				{
-					m_NumBackPresses++;
-					if(m_NumBackPresses >= 3)
-					{
-						// Quit if the Android back-button was pressed 3 times within 1 second
-						return 1;
-					}
-				}
-				m_BackButtonReleased = false;
-			}
-#endif
 			Scancode = TranslateScancode(Event.key);
 			break;
 		case SDL_KEYUP:
-#if defined(CONF_PLATFORM_ANDROID)
-			if(Event.key.keysym.scancode == KEY_AC_BACK && !m_BackButtonReleased)
-			{
-				m_BackButtonReleased = true;
-			}
-#endif
 			Action = IInput::FLAG_RELEASE;
 			Scancode = TranslateScancode(Event.key);
 			break;

diff --git a/src/engine/client/input.h b/src/engine/client/input.h
@@ -76,11 +76,6 @@ class CInput : public IEngineInput
 	bool m_InputGrabbed;
 
 	bool m_MouseFocus;
-#if defined(CONF_PLATFORM_ANDROID)
-	int m_NumBackPresses = 0;
-	bool m_BackButtonReleased = true;
-	int64_t m_LastBackPress = -1;
-#endif
 
 	// IME support
 	std::string m_CompositionString;