commit 7fe7cbab093048499751e67770d38da2390eedbf
parent 01e7b07e4b9ecc33e747ecc1c41ca682c6e7c263
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date:   Wed, 17 May 2023 15:01:43 +0200

fix locale format

Diffstat:

Rapp/src/main/assets/lang/en.json -> app/src/main/assets/lang/en_US.json | 0


Mapp/src/main/kotlin/me/rhunk/snapenhance/bridge/service/BridgeService.kt | 10+++++-----


2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/assets/lang/en.json b/app/src/main/assets/lang/en_US.json
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/service/BridgeService.kt b/app/src/main/kotlin/me/rhunk/snapenhance/bridge/service/BridgeService.kt
@@ -34,7 +34,7 @@ class BridgeService : Service() {
                 runCatching {
                     this@BridgeService.handleMessage(msg)
                 }.onFailure {
-                    Logger.xposedLog("Failed to handle message", it)
+                    Logger.error("Failed to handle message", it)
                 }
             }
         }).binder
@@ -77,7 +77,7 @@ class BridgeService : Service() {
                 }
             }
 
-            else -> Logger.xposedLog("Unknown message type: " + msg.what)
+            else -> Logger.log("Unknown message type: " + msg.what)
         }
     }
 
@@ -105,7 +105,7 @@ class BridgeService : Service() {
                 reply(MessageLoggerResult(state, message).toMessage(BridgeMessageType.MESSAGE_LOGGER_RESULT.value))
             }
             else -> {
-                Logger.xposedLog(Exception("Unknown message logger action: ${msg.action}"))
+                Logger.log(Exception("Unknown message logger action: ${msg.action}"))
             }
         }
 
@@ -113,8 +113,8 @@ class BridgeService : Service() {
     }
 
     private fun handleLocaleRequest(msg: LocaleRequest, reply: (Message) -> Unit) {
-        val deviceLocale = Locale.getDefault().language
-        val compatibleLocale = resources.assets.list("lang")?.find { it.startsWith(deviceLocale) }?.substring(0, 2) ?: "en"
+        val deviceLocale = Locale.getDefault().toString()
+        val compatibleLocale = resources.assets.list("lang")?.find { it.startsWith(deviceLocale) }?.substring(0, 5) ?: "en_US"
 
         resources.assets.open("lang/$compatibleLocale.json").use { inputStream ->
             val json = inputStream.bufferedReader().use { it.readText() }