Merge tag 'v0.4.9'

tag

Change-Id: I83e86a968410daf656930f7a1debc407a3a28c37

Conflicts:
	upstream_infra/fastlane/metadata/android/en-US/changelogs/40004090.txt

app/src/main/kotlin/io/element/android/x/di/AppModule.kt

@@ -23,6 +23,7 @@ import androidx.preference.PreferenceManager
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
+import io.element.android.appconfig.ApplicationConfig
 import io.element.android.features.messages.impl.timeline.components.customreaction.DefaultEmojibaseProvider
 import io.element.android.features.messages.impl.timeline.components.customreaction.EmojibaseProvider
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -84,7 +85,9 @@ object AppModule {
     fun providesBuildMeta(@ApplicationContext context: Context, buildType: BuildType) = BuildMeta(
         isDebuggable = BuildConfig.DEBUG,
         buildType = buildType,
-        applicationName = context.getString(R.string.app_name),
+        applicationName = ApplicationConfig.APPLICATION_NAME.takeIf { it.isNotEmpty() } ?: context.getString(R.string.app_name),
+        productionApplicationName = ApplicationConfig.PRODUCTION_APPLICATION_NAME,
+        desktopApplicationName = ApplicationConfig.DESKTOP_APPLICATION_NAME,
         applicationId = BuildConfig.APPLICATION_ID,
         // TODO EAx Config.LOW_PRIVACY_LOG_ENABLE,
         lowPrivacyLoggingEnabled = false,

appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.appconfig
+
+object ApplicationConfig {
+    /**
+     * Application name used in the UI for string. If empty, the value is taken from the resources `R.string.app_name`.
+     * Note that this value is not used for the launcher icon.
+     * For Element, the value is empty, and so read from `R.string.app_name`, which depends on the build variant:
+     * - "Element X" for release builds;
+     * - "Element X dbg" for debug builds;
+     * - "Element X nightly" for nightly builds.
+     */
+    const val APPLICATION_NAME: String = ""
+
+    /**
+     * Used in the strings to reference the Element client.
+     * Cannot be empty.
+     * For Element, the value is "Element".
+     */
+    const val PRODUCTION_APPLICATION_NAME: String = "Element"
+
+    /**
+     * Used in the strings to reference the Element Desktop client, for instance Element Web.
+     * Cannot be empty.
+     * For Element, the value is "Element". We use the same name for desktop and mobile for now.
+     */
+    const val DESKTOP_APPLICATION_NAME: String = "Element"
+}

features/createroom/impl/src/main/res/values-be/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Новы пакой"</string>
-  <string name="screen_create_room_action_invite_people">"Запрасіце сяброў у Element"</string>
   <string name="screen_create_room_add_people_title">"Запрасіць карыстальникаў"</string>
   <string name="screen_create_room_error_creating_room">"Пры стварэнні пакоя адбылася памылка"</string>
   <string name="screen_create_room_private_option_description">"Паведамленні ў гэтым пакоі зашыфраваны. Гэта шыфраванне нельга адключыць."</string>

features/createroom/impl/src/main/res/values-bg/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Нова стая"</string>
-  <string name="screen_create_room_action_invite_people">"Поканване на хора в Element"</string>
   <string name="screen_create_room_add_people_title">"Поканване на хора"</string>
   <string name="screen_create_room_error_creating_room">"Възникна грешка при създаването на стаята"</string>
   <string name="screen_create_room_private_option_description">"Съобщенията в тази стая са шифровани. Шифроването не може да бъде изключено впоследствие."</string>

features/createroom/impl/src/main/res/values-cs/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nová místnost"</string>
-  <string name="screen_create_room_action_invite_people">"Pozvat přátele do Elementu"</string>
   <string name="screen_create_room_add_people_title">"Pozvat přátele"</string>
   <string name="screen_create_room_error_creating_room">"Při vytváření místnosti došlo k chybě"</string>
   <string name="screen_create_room_private_option_description">"Zprávy v této místnosti jsou šifrované. Šifrování nelze později vypnout."</string>

features/createroom/impl/src/main/res/values-de/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Neuer Raum"</string>
-  <string name="screen_create_room_action_invite_people">"Zu Element einladen"</string>
   <string name="screen_create_room_add_people_title">"Personen einladen"</string>
   <string name="screen_create_room_error_creating_room">"Beim Erstellen des Raums ist ein Fehler aufgetreten"</string>
   <string name="screen_create_room_private_option_description">"Die Nachrichten in diesem Raum sind verschlüsselt. Die Verschlüsselung kann nicht nachträglich deaktiviert werden."</string>

features/createroom/impl/src/main/res/values-es/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nueva sala"</string>
-  <string name="screen_create_room_action_invite_people">"Invita a alguien a Element"</string>
   <string name="screen_create_room_add_people_title">"Invitar personas"</string>
   <string name="screen_create_room_error_creating_room">"Se ha producido un error al crear la sala"</string>
   <string name="screen_create_room_private_option_description">"Los mensajes de esta sala están cifrados. La encriptación no se puede desactivar después."</string>

features/createroom/impl/src/main/res/values-fr/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nouveau salon"</string>
-  <string name="screen_create_room_action_invite_people">"Inviter des amis sur Element"</string>
   <string name="screen_create_room_add_people_title">"Inviter des amis"</string>
   <string name="screen_create_room_error_creating_room">"Une erreur s’est produite lors de la création du salon"</string>
   <string name="screen_create_room_private_option_description">"Les messages dans ce salon sont chiffrés. Le chiffrement ne pourra pas être désactivé par la suite."</string>

features/createroom/impl/src/main/res/values-hu/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Új szoba"</string>
-  <string name="screen_create_room_action_invite_people">"Hívja meg ismerőseit az Elementbe"</string>
   <string name="screen_create_room_add_people_title">"Ismerősök meghívása"</string>
   <string name="screen_create_room_error_creating_room">"Hiba történt a szoba létrehozásakor"</string>
   <string name="screen_create_room_private_option_description">"A szobában lévő üzenetek titkosítottak. A titkosítást utólag nem lehet kikapcsolni."</string>

features/createroom/impl/src/main/res/values-in/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Ruangan baru"</string>
-  <string name="screen_create_room_action_invite_people">"Undang orang-orang ke Element"</string>
   <string name="screen_create_room_add_people_title">"Undang orang-orang"</string>
   <string name="screen_create_room_error_creating_room">"Terjadi kesalahan saat membuat ruangan"</string>
   <string name="screen_create_room_private_option_description">"Pesan di ruangan ini dienkripsi. Enkripsi tidak dapat dinonaktifkan setelahnya."</string>

features/createroom/impl/src/main/res/values-it/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nuova stanza"</string>
-  <string name="screen_create_room_action_invite_people">"Invita persone su Element"</string>
   <string name="screen_create_room_add_people_title">"Invita persone"</string>
   <string name="screen_create_room_error_creating_room">"Si è verificato un errore durante la creazione della stanza"</string>
   <string name="screen_create_room_private_option_description">"I messaggi in questa stanza sono cifrati. La crittografia non può essere disattivata in seguito."</string>

features/createroom/impl/src/main/res/values-ro/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Cameră nouă"</string>
-  <string name="screen_create_room_action_invite_people">"Invitați prieteni în Element"</string>
   <string name="screen_create_room_add_people_title">"Invitați prieteni"</string>
   <string name="screen_create_room_error_creating_room">"A apărut o eroare la crearea camerei"</string>
   <string name="screen_create_room_private_option_description">"Mesajele din această cameră sunt criptate. Criptarea nu poate fi dezactivată ulterior."</string>

features/createroom/impl/src/main/res/values-ru/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Новая комната"</string>
-  <string name="screen_create_room_action_invite_people">"Пригласите друзей в Element"</string>
   <string name="screen_create_room_add_people_title">"Пригласить друзей"</string>
   <string name="screen_create_room_error_creating_room">"Произошла ошибка при создании комнаты"</string>
   <string name="screen_create_room_private_option_description">"Сообщения в этой комнате зашифрованы. Отключить шифрование позже будет невозможно."</string>

features/createroom/impl/src/main/res/values-sk/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nová miestnosť"</string>
-  <string name="screen_create_room_action_invite_people">"Pozvať ľudí na Element"</string>
   <string name="screen_create_room_add_people_title">"Pozvať ľudí"</string>
   <string name="screen_create_room_error_creating_room">"Pri vytváraní miestnosti došlo k chybe"</string>
   <string name="screen_create_room_private_option_description">"Správy v tejto miestnosti sú šifrované. Šifrovanie už potom nie je možné vypnúť."</string>

features/createroom/impl/src/main/res/values-sv/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nytt rum"</string>
-  <string name="screen_create_room_action_invite_people">"Bjud in personer till Element"</string>
   <string name="screen_create_room_add_people_title">"Bjud in personer"</string>
   <string name="screen_create_room_error_creating_room">"Ett fel uppstod när rummet skapades"</string>
   <string name="screen_create_room_private_option_description">"Meddelanden i det här rummet är krypterade. Kryptering kan inte inaktiveras efteråt."</string>

features/createroom/impl/src/main/res/values-uk/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Нова кімната"</string>
-  <string name="screen_create_room_action_invite_people">"Запросити людей до Element"</string>
   <string name="screen_create_room_add_people_title">"Запросити людей"</string>
   <string name="screen_create_room_error_creating_room">"Під час створення кімнати сталася помилка"</string>
   <string name="screen_create_room_private_option_description">"Повідомлення в цій кімнаті зашифровані. Пізніше шифрування вимкнути не можна."</string>

features/createroom/impl/src/main/res/values-zh-rTW/translations.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"建立聊天室"</string>
-  <string name="screen_create_room_action_invite_people">"邀請朋友使用 Element"</string>
   <string name="screen_create_room_add_people_title">"邀請夥伴"</string>
   <string name="screen_create_room_error_creating_room">"建立聊天室時發生錯誤"</string>
   <string name="screen_create_room_private_option_description">"聊天室裡的訊息會被加密。聊天室建立後，無法停用加密功能。"</string>

features/createroom/impl/src/main/res/values/localazy.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"New room"</string>
-  <string name="screen_create_room_action_invite_people">"Invite people to Element"</string>
   <string name="screen_create_room_add_people_title">"Invite people"</string>
   <string name="screen_create_room_error_creating_room">"An error occurred when creating the room"</string>
   <string name="screen_create_room_private_option_description">"Messages in this room are encrypted. Encryption can’t be disabled afterwards."</string>

features/ftue/impl/src/main/res/values-be/translations.xml

@@ -2,13 +2,18 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Вы можаце змяніць налады пазней."</string>
   <string name="screen_notification_optin_title">"Дазвольце апавяшчэнні і ніколі не прапускайце іх"</string>
-  <string name="screen_qr_code_login_initial_state_item_1">"Адкрыйце Element на настольнай прыладзе"</string>
+  <string name="screen_qr_code_login_connecting_subtitle">"Устанаўленне злучэння"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Адкрыйце %1$s на настольнай прыладзе"</string>
   <string name="screen_qr_code_login_initial_state_item_2">"Націсніце на свой аватар"</string>
   <string name="screen_qr_code_login_initial_state_item_3">"Выберыце %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_3_action">"“Звязаць новую прыладу”"</string>
   <string name="screen_qr_code_login_initial_state_item_4">"Выберыце %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_4_action">"“Паказаць QR-код”"</string>
-  <string name="screen_qr_code_login_initial_state_title">"Адкрыйце Element на іншай прыладзе, каб атрымаць QR-код"</string>
+  <string name="screen_qr_code_login_initial_state_title">"Адкрыйце %1$s на іншай прыладзе, каб атрымаць QR-код"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Выкарыстоўвайце QR-код, паказаны на іншай прыладзе."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Паўтарыць спробу"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Няправільны QR-код"</string>
+  <string name="screen_qr_code_login_scanning_state_title">"Сканаваць QR-код"</string>
   <string name="screen_welcome_bullet_1">"Званкі, апытанні, пошук і многае іншае будзе дададзена пазней у гэтым годзе."</string>
   <string name="screen_welcome_bullet_2">"Гісторыя паведамленняў для зашыфраваных пакояў пакуль недаступна."</string>
   <string name="screen_welcome_bullet_3">"Мы будзем рады пачуць вашае меркаванне, паведаміце нам аб гэтым праз старонку налад."</string>

features/ftue/impl/src/main/res/values-de/translations.xml

@@ -2,6 +2,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Du kannst deine Einstellungen später ändern."</string>
   <string name="screen_notification_optin_title">"Erlaube Benachrichtigungen und verpasse keine Nachricht"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"%1$s auf einem Desktop-Gerät öffnen"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Klick auf deinen Avatar"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Wähle %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"\"Neues Gerät verknüpfen\""</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Wähle %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_4_action">"\"QR-Code anzeigen\""</string>
+  <string name="screen_qr_code_login_initial_state_title">"Öffne %1$s auf einem anderen Gerät, um den QR-Code zu erhalten"</string>
   <string name="screen_welcome_bullet_1">"Anrufe, Umfragen, Suchfunktionen und mehr werden im Laufe des Jahres hinzugefügt."</string>
   <string name="screen_welcome_bullet_2">"Der Nachrichtenverlauf für verschlüsselte Räume wird in diesem Update nicht verfügbar sein."</string>
   <string name="screen_welcome_bullet_3">"Wir würden uns freuen, von dir zu hören. Teile uns deine Meinung über die Einstellungsseite mit."</string>

features/ftue/impl/src/main/res/values-fr/translations.xml

@@ -2,6 +2,18 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Vous pourrez modifier vos paramètres ultérieurement."</string>
   <string name="screen_notification_optin_title">"Autorisez les notifications et ne manquez aucun message"</string>
+  <string name="screen_qr_code_login_connecting_subtitle">"Établissement de la connexion"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Ouvrez %1$s sur un ordinateur"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Cliquez sur votre image de profil"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Choisissez %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"“Associer une nouvelle session”"</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Choisissez %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_4_action">"“Afficher le QR code”"</string>
+  <string name="screen_qr_code_login_initial_state_title">"Ouvrez %1$s sur un autre appareil pour obtenir le QR code"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Scannez le QR code affiché sur l’autre appareil."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Réessayer"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"QR code erroné"</string>
+  <string name="screen_qr_code_login_scanning_state_title">"Scannez le QR code"</string>
   <string name="screen_welcome_bullet_1">"Les appels, les sondages, les recherches et plus encore seront ajoutés plus tard cette année."</string>
   <string name="screen_welcome_bullet_2">"L’historique des messages pour les salons chiffrés ne sera pas disponible dans cette mise à jour."</string>
   <string name="screen_welcome_bullet_3">"N’hésitez pas à nous faire part de vos commentaires via l’écran des paramètres."</string>