gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix to parse OpenAI translations.

Browse Source 
The parsed result was without quotes which resulted in error:

Unterminated object at character 21 of [{fromLabel=English (US),

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-06-26 13:23:55 +02:00
parent 817ea1ab64
commit 64d0f0e2cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt
View File

@ -156,7 +156,7 @@ class TranslateActivity : BaseActivity() {
private fun getLanguageOptions() { private fun getLanguageOptions() {
val currentUser = userManager.currentUser.blockingGet() val currentUser = userManager.currentUser.blockingGet()
val json = JSONArray(CapabilitiesUtilNew.getLanguages(currentUser).toString()) val json = JSONArray((CapabilitiesUtilNew.getLanguages(currentUser) as ArrayList<*>).toArray())
val fromLanguagesSet = mutableSetOf(resources.getString(R.string.translation_detect_language)) val fromLanguagesSet = mutableSetOf(resources.getString(R.string.translation_detect_language))
val toLanguagesSet = mutableSetOf(resources.getString(R.string.translation_device_settings)) val toLanguagesSet = mutableSetOf(resources.getString(R.string.translation_device_settings))
@ -212,7 +212,7 @@ class TranslateActivity : BaseActivity() {
private fun getISOFromServer(language: String): String { private fun getISOFromServer(language: String): String {
val currentUser = userManager.currentUser.blockingGet() val currentUser = userManager.currentUser.blockingGet()
val json = JSONArray(CapabilitiesUtilNew.getLanguages(currentUser).toString()) val json = JSONArray((CapabilitiesUtilNew.getLanguages(currentUser) as ArrayList<*>).toArray())
for (i in 0 until json.length()) { for (i in 0 until json.length()) {
val current = json.getJSONObject(i) val current = json.getJSONObject(i)

2
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
View File

@ -95,7 +95,7 @@ class MessageActionsDialog(
!message.isDeleted && !message.isDeleted &&
ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getCalculateMessageType() && ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getCalculateMessageType() &&
CapabilitiesUtilNew.isTranslationsSupported(user) && CapabilitiesUtilNew.isTranslationsSupported(user) &&
JSONArray(CapabilitiesUtilNew.getLanguages(user).toString()).length() > 0 JSONArray((CapabilitiesUtilNew.getLanguages(user) as ArrayList<*>).toArray()).length() > 0
) )
initMenuReplyToMessage(message.replyable && hasChatPermission) initMenuReplyToMessage(message.replyable && hasChatPermission)
initMenuReplyPrivately( initMenuReplyPrivately(