Browse Source

Expose invitation group tags and localized Android titles

master
evgeny 1 week ago
parent
commit
0ce6e9e83a
  1. 3
      tools/chatgui-android/app/src/main/java/com/utun/chat/data/ChatRepository.kt
  2. 1
      tools/chatgui-android/app/src/main/res/values-ru/strings.xml
  3. 1
      tools/chatgui-android/app/src/main/res/values/strings.xml

3
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 },

1
tools/chatgui-android/app/src/main/res/values-ru/strings.xml

@ -331,6 +331,7 @@
<string name="start_on_boot_hint">"Запускать включённый сервис после первой разблокировки телефона после перезагрузки."</string>
<string name="start_on_boot_save_failed">"Не удалось сохранить настройку автозапуска"</string>
<string name="invite_to_group">Пригласить в группу</string>
<string name="group_invitation">Приглашение в группу «%1$s»</string>
<string name="invite_recipient">Получатель: %1$s</string>
<string name="invite_choose_group">Выберите группу</string>
<string name="invite_no_groups">Нет групп для приглашения.</string>

1
tools/chatgui-android/app/src/main/res/values/strings.xml

@ -329,6 +329,7 @@
<string name="start_on_boot_hint">"Start the enabled service after the first unlock following a reboot."</string>
<string name="start_on_boot_save_failed">"Could not save the startup setting"</string>
<string name="invite_to_group">Invite to group</string>
<string name="group_invitation">Invitation to group “%1$s”</string>
<string name="invite_recipient">Recipient: %1$s</string>
<string name="invite_choose_group">Choose a group</string>
<string name="invite_no_groups">No groups available for invitations.</string>

Loading…
Cancel
Save