From 0ce6e9e83aee3e225b101de1c1711860f830a6dc Mon Sep 17 00:00:00 2001 From: evgeny Date: Sun, 4 Oct 2026 18:06:55 +0200 Subject: [PATCH] Expose invitation group tags and localized Android titles --- .../app/src/main/java/com/utun/chat/data/ChatRepository.kt | 3 ++- tools/chatgui-android/app/src/main/res/values-ru/strings.xml | 1 + tools/chatgui-android/app/src/main/res/values/strings.xml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/ChatRepository.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/ChatRepository.kt index 6df75452..510c1ab4 100644 --- a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/ChatRepository.kt +++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/ChatRepository.kt @@ -67,7 +67,7 @@ data class Message(val id: Long, val author: String, val text: String, val ts: L val imageWidth: Int = 0, val imageHeight: Int = 0, val videoWidth: Int = 0, val videoHeight: Int = 0, val videoDurationMs: Int = 0, val downloadState: String = "", /* "", "downloading", "downloaded", "error" */ - val deliveryStatusRes: Int = 0) + val deliveryStatusRes: Int = 0, val inviteGroupName: String? = null) data class ChatMember(val nodeId: Long, val name: String, val online: Boolean = false, val isAdmin: Boolean = false, val isSuper: Boolean = false, @@ -592,6 +592,7 @@ class ChatRepository { ts = obj.optLong("ts", 0), isOutgoing = outgoing, contentType = obj.optString("content_type", "text/plain"), + inviteGroupName = if (obj.optString("ct") == "invite") obj.getJSONObject("tags").getString("group_name") else null, filePath = path, fileSize = obj.optLong("media_size"), waveform = obj.optString("waveform").map { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(it).coerceAtLeast(0) / 63f }, diff --git a/tools/chatgui-android/app/src/main/res/values-ru/strings.xml b/tools/chatgui-android/app/src/main/res/values-ru/strings.xml index 083bfdce..aa68238c 100644 --- a/tools/chatgui-android/app/src/main/res/values-ru/strings.xml +++ b/tools/chatgui-android/app/src/main/res/values-ru/strings.xml @@ -331,6 +331,7 @@ "Запускать включённый сервис после первой разблокировки телефона после перезагрузки." "Не удалось сохранить настройку автозапуска" Пригласить в группу + Приглашение в группу «%1$s» Получатель: %1$s Выберите группу Нет групп для приглашения. diff --git a/tools/chatgui-android/app/src/main/res/values/strings.xml b/tools/chatgui-android/app/src/main/res/values/strings.xml index f3b185bd..4b41783c 100644 --- a/tools/chatgui-android/app/src/main/res/values/strings.xml +++ b/tools/chatgui-android/app/src/main/res/values/strings.xml @@ -329,6 +329,7 @@ "Start the enabled service after the first unlock following a reboot." "Could not save the startup setting" Invite to group + Invitation to group “%1$s” Recipient: %1$s Choose a group No groups available for invitations.