Merge remote-tracking branch 'origin/develop' into feature/fga/pinned_message_banner_ui

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt

@@ -60,6 +60,7 @@ import io.element.android.libraries.matrix.api.room.Mention
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraftType
 import io.element.android.libraries.matrix.api.room.isDm
+import io.element.android.libraries.matrix.api.timeline.TimelineException
 import io.element.android.libraries.matrix.ui.messages.RoomMemberProfilesCache
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 import io.element.android.libraries.matrix.ui.messages.reply.map
@@ -436,7 +437,14 @@ class MessageComposerPresenter @Inject constructor(
                 val eventId = capturedMode.eventId
                 val transactionId = capturedMode.transactionId
                 timelineController.invokeOnCurrentTimeline {
+                    // First try to edit the message in the current timeline
                     editMessage(eventId, transactionId, message.markdown, message.html, message.mentions)
+                        .onFailure { cause ->
+                            if (cause is TimelineException.EventNotFound && eventId != null) {
+                                // if the event is not found in the timeline, try to edit the message directly
+                                room.editMessage(eventId, message.markdown, message.html, message.mentions)
+                            }
+                        }
                 }
             }
 

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt

@@ -264,27 +264,27 @@ class TimelineItemContentMessageFactory @Inject constructor(
     }
 
     private fun CharSequence.withFixedURLSpans(): CharSequence {
-        if (this !is Spannable) return this
+        val spannable = this.toSpannable()
         // Get all URL spans, as they will be removed by LinkifyCompat.addLinks
-        val oldURLSpans = getSpans<URLSpan>(0, length).associateWith {
-            val start = getSpanStart(it)
-            val end = getSpanEnd(it)
+        val oldURLSpans = spannable.getSpans<URLSpan>(0, length).associateWith {
+            val start = spannable.getSpanStart(it)
+            val end = spannable.getSpanEnd(it)
             Pair(start, end)
         }
         // Find and set as URLSpans any links present in the text
-        LinkifyCompat.addLinks(this, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES)
+        LinkifyCompat.addLinks(spannable, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES)
         // Restore old spans, remove new ones if there is a conflict
         for ((urlSpan, location) in oldURLSpans) {
             val (start, end) = location
-            val addedSpans = getSpans<URLSpan>(start, end).orEmpty()
+            val addedSpans = spannable.getSpans<URLSpan>(start, end).orEmpty()
             if (addedSpans.isNotEmpty()) {
                 for (span in addedSpans) {
-                    removeSpan(span)
+                    spannable.removeSpan(span)
                 }
             }
-            setSpan(urlSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            spannable.setSpan(urlSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         }
-        return this
+        return spannable
     }
 }
 

features/messages/impl/src/main/res/values-ka/translations.xml

@@ -21,8 +21,10 @@
   <string name="screen_room_attachment_source_poll">"გამოკითხვა"</string>
   <string name="screen_room_attachment_text_formatting">"ტექსტის ფორმატირება"</string>
   <string name="screen_room_encrypted_history_banner">"შეტყობინებების ისტორია ამჟამად მიუწვდომელია."</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"შეტყობინებების ისტორია ამ ოთახში მიუწვდომელია. დაადასტურეთ ეს მოწყობილობა თქვენი შეტყობინებების ისტორიის სანახავად."</string>
   <string name="screen_room_invite_again_alert_message">"გსურთ მათი კვლავ მოწვევა?"</string>
   <string name="screen_room_invite_again_alert_title">"თქვენ მარტო ხართ ამ ჩატში"</string>
+  <string name="screen_room_mentions_at_room_subtitle">"მთელი ოთახისათვის შეტყობინება"</string>
   <string name="screen_room_mentions_at_room_title">"ყველა"</string>
   <string name="screen_room_retry_send_menu_send_again_action">"Ხელახლა გაგზავნა"</string>
   <string name="screen_room_retry_send_menu_title">"თქვენი შეტყობინების გაგზავნა ვერ მოხერხდა"</string>

features/messages/impl/src/main/res/values-pl/translations.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktywności"</string>
+  <string name="emoji_picker_category_flags">"Flagi"</string>
+  <string name="emoji_picker_category_foods">"Jedzenie i napoje"</string>
+  <string name="emoji_picker_category_nature">"Zwierzęta i natura"</string>
+  <string name="emoji_picker_category_objects">"Obiekty"</string>
+  <string name="emoji_picker_category_people">"Buźki i osoby"</string>
+  <string name="emoji_picker_category_places">"Podróż i miejsca"</string>
+  <string name="emoji_picker_category_symbols">"Symbole"</string>
+  <string name="screen_report_content_block_user">"Zablokuj użytkownika"</string>
+  <string name="screen_report_content_block_user_hint">"Sprawdź, czy chcesz ukryć wszystkie bieżące i przyszłe wiadomości od tego użytkownika."</string>
+  <string name="screen_report_content_explanation">"Ta wiadomość zostanie zgłoszona do administratora Twojego serwera domowego. Nie będzie mógł on przeczytać żadnych zaszyfrowanych wiadomości."</string>
+  <string name="screen_report_content_hint">"Powód zgłoszenia treści"</string>
+  <string name="screen_room_attachment_source_camera">"Kamera"</string>
+  <string name="screen_room_attachment_source_camera_photo">"Zrób zdjęcie"</string>
+  <string name="screen_room_attachment_source_camera_video">"Nagraj film"</string>
+  <string name="screen_room_attachment_source_files">"Załącznik"</string>
+  <string name="screen_room_attachment_source_gallery">"Zdjęcia i filmy"</string>
+  <string name="screen_room_attachment_source_location">"Lokalizacja"</string>
+  <string name="screen_room_attachment_source_poll">"Ankieta"</string>
+  <string name="screen_room_attachment_text_formatting">"Formatowanie tekstu"</string>
+  <string name="screen_room_encrypted_history_banner">"Historia wiadomości jest obecnie niedostępna."</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"Historia wiadomości jest niedostępna w tym pokoju. Zweryfikuj to urządzenie, aby zobaczyć historię wiadomości."</string>
+  <string name="screen_room_invite_again_alert_message">"Czy chcesz zaprosić ich z powrotem?"</string>
+  <string name="screen_room_invite_again_alert_title">"Jesteś sam na tym czacie"</string>
+  <string name="screen_room_mentions_at_room_subtitle">"Powiadom cały pokój"</string>
+  <string name="screen_room_mentions_at_room_title">"Wszyscy"</string>
+  <string name="screen_room_retry_send_menu_send_again_action">"Wyślij ponownie"</string>
+  <string name="screen_room_retry_send_menu_title">"Nie udało się wysłać wiadomości"</string>
+  <string name="screen_room_timeline_add_reaction">"Dodaj emoji"</string>
+  <string name="screen_room_timeline_beginning_of_room">"To jest początek %1$s"</string>
+  <string name="screen_room_timeline_beginning_of_room_no_name">"To jest początek tej konwersacji"</string>
+  <string name="screen_room_timeline_less_reactions">"Pokaż mniej"</string>
+  <string name="screen_room_timeline_message_copied">"Skopiowano wiadomość"</string>
+  <string name="screen_room_timeline_no_permission_to_post">"Nie masz uprawnień, aby pisać w tym pokoju"</string>
+  <string name="screen_room_timeline_reactions_show_less">"Pokaż mniej"</string>
+  <string name="screen_room_timeline_reactions_show_more">"Pokaż więcej"</string>
+  <string name="screen_room_timeline_read_marker_title">"Nowe"</string>
+  <plurals name="screen_room_timeline_state_changes">
+    <item quantity="one">"%1$d zmiana pokoju"</item>
+    <item quantity="few">"%1$d zmian pokoju"</item>
+    <item quantity="many">"%1$d zmiany pokoju"</item>
+  </plurals>
+  <plurals name="screen_room_typing_notification">
+    <item quantity="one">"%1$s piszę"</item>
+    <item quantity="few">"%1$s piszą"</item>
+    <item quantity="many">"%1$s piszą"</item>
+  </plurals>
+</resources>

features/messages/impl/src/main/res/values-pt-rBR/translations.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Atividades"</string>
+  <string name="emoji_picker_category_flags">"Bandeiras"</string>
+  <string name="emoji_picker_category_foods">"Comida &amp; Bebida"</string>
+  <string name="emoji_picker_category_nature">"Animais &amp; Natureza"</string>
+  <string name="emoji_picker_category_objects">"Objetos"</string>
+  <string name="emoji_picker_category_people">"Sorrisos &amp; Pessoas"</string>
+  <string name="emoji_picker_category_places">"Viagens &amp; Lugares"</string>
+  <string name="emoji_picker_category_symbols">"Símbolos"</string>
+  <string name="screen_report_content_block_user">"Bloquear usuário"</string>
+  <string name="screen_report_content_block_user_hint">"Marque se você deseja ocultar todas as mensagens atuais e futuras desse usuário"</string>
+  <string name="screen_report_content_explanation">"Essa mensagem será reportada ao administrador do seu homeserver. Eles não conseguirão ler nenhuma mensagem criptografada."</string>
+  <string name="screen_report_content_hint">"Motivo para denunciar este conteúdo"</string>
+  <string name="screen_room_attachment_source_camera">"Câmera"</string>
+  <string name="screen_room_attachment_source_camera_photo">"Tirar foto"</string>
+  <string name="screen_room_attachment_source_camera_video">"Gravar vídeo"</string>
+  <string name="screen_room_attachment_source_files">"Anexo"</string>
+  <string name="screen_room_attachment_source_gallery">"Biblioteca de fotos e vídeos"</string>
+  <string name="screen_room_attachment_source_location">"Localização"</string>
+  <string name="screen_room_attachment_source_poll">"Enquete"</string>
+  <string name="screen_room_attachment_text_formatting">"Formatação de texto"</string>
+  <string name="screen_room_encrypted_history_banner">"O histórico de mensagens não está disponível no momento."</string>
+  <string name="screen_room_invite_again_alert_message">"Gostaria de convidá-los de volta?"</string>
+  <string name="screen_room_invite_again_alert_title">"Você está sozinho neste chat"</string>
+  <string name="screen_room_mentions_at_room_title">"Todos"</string>
+  <string name="screen_room_retry_send_menu_send_again_action">"Enviar novamente"</string>
+  <string name="screen_room_retry_send_menu_title">"Sua mensagem não foi enviada"</string>
+  <string name="screen_room_timeline_add_reaction">"Adicionar emoji"</string>
+  <string name="screen_room_timeline_beginning_of_room">"Este é o início do %1$s."</string>
+  <string name="screen_room_timeline_beginning_of_room_no_name">"Este é o início desta conversa."</string>
+  <string name="screen_room_timeline_less_reactions">"Mostrar menos"</string>
+  <string name="screen_room_timeline_message_copied">"Mensagem copiada"</string>
+  <string name="screen_room_timeline_no_permission_to_post">"Você não tem permissão para postar nesta sala"</string>
+  <string name="screen_room_timeline_reactions_show_less">"Mostrar menos"</string>
+  <string name="screen_room_timeline_reactions_show_more">"Mostrar mais"</string>
+  <string name="screen_room_timeline_read_marker_title">"Novo"</string>
+  <plurals name="screen_room_timeline_state_changes">
+    <item quantity="one">"%1$d mudança de sala"</item>
+    <item quantity="other">"%1$d mudanças de salas"</item>
+  </plurals>
+</resources>