From 23c6d0c31f2e0a4a6032b0afb02fab1d5f9c517b Mon Sep 17 00:00:00 2001
From: Maksim <MoNTE48@mail.ua>
Date: Fri, 17 Apr 2020 23:46:30 +0200
Subject: Android: fix handling non-latin characters on older Android devices
 (#9309)

---
 src/server.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index b3992b9b1..c32aa5306 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3031,8 +3031,16 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 		line += L"-!- You don't have permission to shout.";
 		broadcast_line = false;
 	} else {
+		/*
+			Workaround for fixing chat on Android. Lua doesn't handle
+			the Cyrillic alphabet and some characters on older Android devices
+		*/
+#ifdef __ANDROID__
+		line += L"<" + wname + L"> " + wmessage;
+#else
 		line += narrow_to_wide(m_script->formatChatMessage(name,
 				wide_to_narrow(wmessage)));
+#endif
 	}
 
 	/*
-- 
cgit v1.2.3