android: rework incognito mode - choose when making connection (#2867)

* android: rework incognito mode - choose when making connection

* remove commented code

* remove commented code

* change text

* text editor border

* smaller qr code

* chat preview height

* fix spacing

* desktop dialogue

* remove import

---------

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>

apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml

@@ -7,9 +7,12 @@
   <string name="connect_via_contact_link">Connect via contact link?</string>
   <string name="connect_via_invitation_link">Connect via invitation link?</string>
   <string name="connect_via_group_link">Connect via group link?</string>
+  <string name="connect_use_current_profile">Use current profile</string>
+  <string name="connect_use_new_incognito_profile">Use new incognito profile</string>
   <string name="profile_will_be_sent_to_contact_sending_link">Your profile will be sent to the contact that you received this link from.</string>
   <string name="you_will_join_group">You will join a group this link refers to and connect to its group members.</string>
   <string name="connect_via_link_verb">Connect</string>
+  <string name="connect_via_link_incognito">Connect incognito</string>
 
   <!-- MainActivity.kt -->
   <string name="opening_database">Opening database…</string>
@@ -443,7 +446,7 @@
 
 
   <!-- Pending contact connection alert dialogues -->
-  <string name="you_invited_your_contact">You invited your contact</string>
+  <string name="you_invited_a_contact">You invited a contact</string>
   <string name="you_accepted_connection">You accepted connection</string>
   <string name="delete_pending_connection__question">Delete pending connection?</string>
   <string name="contact_you_shared_link_with_wont_be_able_to_connect">The contact you shared this link with will NOT be able to connect!</string>
@@ -489,11 +492,13 @@
   <string name="your_chat_profile_will_be_sent_to_your_contact">Your chat profile will be sent\nto your contact</string>
   <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link"><![CDATA[If you cannot meet in person, you can <b>scan QR code in the video call</b>, or your contact can share an invitation link.]]></string>
   <string name="share_invitation_link">Share 1-time link</string>
-  <string name="paste_connection_link_below_to_connect">Paste the link you received into the box below to connect with your contact.</string>
-  <string name="your_profile_will_be_sent">Your chat profile will be sent to your contact</string>
+  <string name="paste_the_link_you_received_to_connect_with_your_contact">Paste the link you received to connect with your contact…</string>
   <string name="learn_more">Learn more</string>
   <string name="learn_more_about_address">About SimpleX address</string>
 
+  <string name="connect__a_new_random_profile_will_be_shared">A new random profile will be shared.</string>
+  <string name="connect__your_profile_will_be_shared">Your profile %1$s will be shared.</string>
+
   <!-- Add Contact Learn More - AddContactLearnMore.kt -->
   <string name="scan_qr_to_connect_to_contact">To connect, your contact can scan QR code or use the link in the app.</string>
   <string name="if_you_cant_meet_in_person">If you can\'t meet in person, show QR code in a video call, or share the link.</string>
@@ -1247,7 +1252,6 @@
   <string name="group_is_decentralized">The group is fully decentralized – it is visible only to the members.</string>
   <string name="group_display_name_field">Group display name:</string>
   <string name="group_full_name_field">Group full name:</string>
-  <string name="group_unsupported_incognito_main_profile_sent">Incognito mode is not supported here - your main profile will be sent to group members</string>
   <string name="group_main_profile_sent">Your chat profile will be sent to group members</string>
 
 
@@ -1301,13 +1305,10 @@
   <!-- Incognito mode -->
   <string name="incognito">Incognito</string>
   <string name="incognito_random_profile">Your random profile</string>
-  <string name="incognito_random_profile_description">A random profile will be sent to your contact</string>
-  <string name="incognito_random_profile_from_contact_description">A random profile will be sent to the contact that you received this link from</string>
 
-  <string name="incognito_info_protects">Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</string>
+  <string name="incognito_info_protects">Incognito mode protects your privacy by using a new random profile for each contact.</string>
   <string name="incognito_info_allows">It allows having many anonymous connections without any shared data between them in a single chat profile.</string>
   <string name="incognito_info_share">When you share an incognito profile with somebody, this profile will be used for the groups they invite you to.</string>
-  <string name="incognito_info_find">To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</string>
 
   <!-- Default themes -->
   <string name="theme_system">System</string>

apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml

@@ -201,7 +201,7 @@
     <string name="mark_unread">Označit jako nepřečteno</string>
     <string name="mute_chat">Ztlumit</string>
     <string name="unmute_chat">Zrušit ztlumení</string>
-    <string name="you_invited_your_contact">Pozvali jste kontakt</string>
+    <string name="you_invited_a_contact">Pozvali jste kontakt</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">Kontakt, se kterým jste tento odkaz sdíleli, se NEBUDE moci připojit!</string>
     <string name="connection_you_accepted_will_be_cancelled">Připojení, které jste přijali, bude zrušeno!</string>
     <string name="icon_descr_help">help</string>

apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml

@@ -292,7 +292,7 @@
     <string name="mute_chat">Stummschalten</string>
     <string name="unmute_chat">Stummschaltung aufheben</string>
     <!-- Pending contact connection alert dialogues -->
-    <string name="you_invited_your_contact">Sie haben Ihren Kontakt eingeladen</string>
+    <string name="you_invited_a_contact">Sie haben Ihren Kontakt eingeladen</string>
     <string name="you_accepted_connection">Sie haben die Verbindung akzeptiert</string>
     <string name="delete_pending_connection__question">Ausstehende Verbindung löschen?</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">Der Kontakt, mit dem Sie diesen Link geteilt haben, kann sich NICHT verbinden!</string>

apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml

@@ -914,7 +914,7 @@
     <string name="you_are_observer">Tu rol es observador</string>
     <string name="verify_security_code">Comprobar código de seguridad</string>
     <string name="you_accepted_connection">Has aceptado la conexión</string>
-    <string name="you_invited_your_contact">Has invitado a tu contacto</string>
+    <string name="you_invited_a_contact">Has invitado a tu contacto</string>
     <string name="you_will_be_connected_when_group_host_device_is_online">Te conectarás al grupo cuando el dispositivo anfitrión esté en línea, por favor espera o compruébalo más tarde.</string>
     <string name="your_settings">Tu configuración</string>
     <string name="your_SMP_servers">Servidores SMP</string>

apps/multiplatform/common/src/commonMain/resources/MR/fi/strings.xml

@@ -1232,7 +1232,7 @@
     <string name="group_preview_you_are_invited">sinut on kutsuttu ryhmään</string>
     <string name="unmute_chat">Poista mykistys</string>
     <string name="you_accepted_connection">Hyväksyit yhteyden</string>
-    <string name="you_invited_your_contact">Kutsuit kontaktisi</string>
+    <string name="you_invited_a_contact">Kutsuit kontaktisi</string>
     <string name="call_connection_via_relay">releellä</string>
     <string name="database_downgrade_warning">Varoitus: saatat menettää joitain tietoja!</string>
     <string name="icon_descr_address">SimpleX Osoite</string>

apps/multiplatform/common/src/commonMain/resources/MR/fr/strings.xml

@@ -221,7 +221,7 @@
     <string name="mark_read">Marquer comme lu</string>
     <string name="mark_unread">Marquer non lu</string>
     <string name="set_contact_name">Définir le nom du contact</string>
-    <string name="you_invited_your_contact">Vous avez invité votre contact</string>
+    <string name="you_invited_a_contact">Vous avez invité votre contact</string>
     <string name="you_accepted_connection">Vous avez accepté la connexion</string>
     <string name="delete_pending_connection__question">Supprimer la connexion en attente \?</string>
     <string name="connection_you_accepted_will_be_cancelled">La connexion que vous avez acceptée sera annulée !</string>

apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml

@@ -568,7 +568,7 @@
     <string name="icon_descr_address">Indirizzo di SimpleX</string>
     <string name="icon_descr_simplex_team">Squadra di SimpleX</string>
     <string name="you_accepted_connection">Hai accettato la connessione</string>
-    <string name="you_invited_your_contact">Hai invitato il contatto</string>
+    <string name="you_invited_a_contact">Hai invitato il contatto</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Il tuo profilo di chat verrà inviato
 \nal tuo contatto</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Il tuo contatto deve essere in linea per completare la connessione.

apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml

@@ -1182,7 +1182,7 @@
     <string name="waiting_for_video">ממתין לסרטון</string>
     <string name="waiting_for_file">ממתין לקובץ</string>
     <string name="voice_messages_prohibited">הודעות קוליות אסורות!</string>
-    <string name="you_invited_your_contact">הזמנת את איש הקשר שלך</string>
+    <string name="you_invited_a_contact">הזמנת את איש הקשר שלך</string>
     <string name="you_can_share_your_address">באפשרותכם לשתף את הכתובת שלכם כקישור או כקוד QR – כל אחד יכול להתחבר אליכם.</string>
     <string name="you_can_accept_or_reject_connection">כאשר אנשים מבקשים להתחבר, באפשרותך לקבל או לדחות זאת.</string>
     <string name="you_can_also_connect_by_clicking_the_link"><![CDATA[באפשרותכם גם להתחבר על־ידי לחיצה על הקישור. אם הוא נפתח בדפדפן, ליחצו על הכפתור <b>פתח באפליקציה</b>.]]></string>

apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml

@@ -715,7 +715,7 @@
     <string name="thank_you_for_installing_simplex">SimpleX Chatをご利用いただきありがとうございます！</string>
     <string name="use_camera_button">カメラ</string>
     <string name="you_accepted_connection">繋がりを承認しました</string>
-    <string name="you_invited_your_contact">連絡先に招待を送りました</string>
+    <string name="you_invited_a_contact">連絡先に招待を送りました</string>
     <string name="connection_you_accepted_will_be_cancelled">承認ずみの接続がキャンセルされます！</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">あなたからリンクを受けた連絡先が接続できなくなります！</string>
     <string name="icon_descr_address">SimpleXアドレス</string>

apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml

@@ -682,7 +682,7 @@
     <string name="connection_you_accepted_will_be_cancelled">De door u geaccepteerde verbinding wordt geannuleerd!</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">Het contact met wie je deze link hebt gedeeld, kan GEEN verbinding maken!</string>
     <string name="you_accepted_connection">Je hebt de verbinding geaccepteerd</string>
-    <string name="you_invited_your_contact">Je hebt je contactpersoon uitgenodigd</string>
+    <string name="you_invited_a_contact">Je hebt je contactpersoon uitgenodigd</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Uw contactpersoon moet online zijn om de verbinding te voltooien.
 \nU kunt deze verbinding verbreken en het contact verwijderen (en later proberen met een nieuwe link).</string>
     <string name="image_descr_qr_code">QR code</string>

apps/multiplatform/common/src/commonMain/resources/MR/pl/strings.xml

@@ -257,7 +257,7 @@
     <string name="unmute_chat">Wyłącz wyciszenie</string>
     <string name="contact_wants_to_connect_with_you">chce się z Tobą połączyć!</string>
     <string name="you_accepted_connection">Zaakceptowałeś połączenie</string>
-    <string name="you_invited_your_contact">Zaprosiłeś swój kontakt</string>
+    <string name="you_invited_a_contact">Zaprosiłeś swój kontakt</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Twój kontakt musi być online, aby połączenie zostało zakończone.
 \nMożesz anulować to połączenie i usunąć kontakt (i spróbować później z nowym linkiem).</string>
     <string name="connect_button">Połącz</string>

apps/multiplatform/common/src/commonMain/resources/MR/pt-rBR/strings.xml

@@ -473,7 +473,7 @@
     <string name="simplex_service_notification_text">Recebendo mensagens…</string>
     <string name="large_file">Aruivo grande!</string>
     <string name="mark_read">Marcado como lido</string>
-    <string name="you_invited_your_contact">Você convidou seu contato</string>
+    <string name="you_invited_a_contact">Você convidou seu contato</string>
     <string name="invalid_QR_code">Código QR inválido</string>
     <string name="icon_descr_more_button">Mais</string>
     <string name="you_will_be_connected_when_group_host_device_is_online">Você será conectado ao grupo quando o dispositivo do host do grupo estiver online, por favor aguarde ou verifique mais tarde!</string>

apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml

@@ -294,7 +294,7 @@
     <string name="mute_chat">Без звука</string>
     <string name="unmute_chat">Уведомлять</string>
     <!-- Pending contact connection alert dialogues -->
-    <string name="you_invited_your_contact">Вы пригласили Ваш контакт</string>
+    <string name="you_invited_a_contact">Вы пригласили Ваш контакт</string>
     <string name="you_accepted_connection">Вы приняли приглашение соединиться</string>
     <string name="delete_pending_connection__question">Удалить ожидаемое соединение?</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">Контакт, которому Вы отправили эту ссылку, не сможет соединиться!</string>

apps/multiplatform/common/src/commonMain/resources/MR/th/strings.xml

@@ -1126,7 +1126,7 @@
     <string name="to_start_a_new_chat_help_header">เพื่อเริ่มแชทใหม่</string>
     <string name="gallery_video_button">วิดีโอ</string>
     <string name="unmute_chat">เปิดเสียง</string>
-    <string name="you_invited_your_contact">คุณได้เชิญผู้ติดต่อของคุณ</string>
+    <string name="you_invited_a_contact">คุณได้เชิญผู้ติดต่อของคุณ</string>
     <string name="you_accepted_connection">คุณยอมรับการเชื่อมต่อ</string>
     <string name="contact_wants_to_connect_with_you">ต้องการเชื่อมต่อกับคุณ!</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">ผู้ติดต่อของคุณจะต้องออนไลน์เพื่อให้การเชื่อมต่อเสร็จสมบูรณ์

apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml

@@ -226,7 +226,7 @@
     <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app"><![CDATA[📱 мобільний: торкніться <b>Відкрийте в мобільному додатку</b>, потім торкніться <b>Підключіть</b> в додатку.]]></string>
     <string name="mute_chat">Вимкнути звук</string>
     <string name="unmute_chat">Увімкнути звук</string>
-    <string name="you_invited_your_contact">Ви запросили свого контакта</string>
+    <string name="you_invited_a_contact">Ви запросили свого контакта</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">Контакт, якому ви надали це посилання, НЕ зможе підключитися!</string>
     <string name="icon_descr_profile_image_placeholder">заповнювач зображення профілю</string>
     <string name="image_descr_qr_code">QR-код</string>

apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml

@@ -902,7 +902,7 @@
     <string name="voice_messages_prohibited">语音消息禁止发送！</string>
     <string name="you_need_to_allow_to_send_voice">您需要允许您的联系人发送语音消息才能发送它们。</string>
     <string name="scan_QR_code">扫描二维码</string>
-    <string name="you_invited_your_contact">您邀请了您的联系人</string>
+    <string name="you_invited_a_contact">您邀请了您的联系人</string>
     <string name="contact_wants_to_connect_with_you">想要与您连接！</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">您的联系人需要在线才能完成连接。
 \n您可以取消此连接并删除联系人（稍后尝试使用新链接）。</string>

apps/multiplatform/common/src/commonMain/resources/MR/zh-rTW/strings.xml

@@ -533,7 +533,7 @@
     <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[你可以透過 <font color="#0088ff">連接到 SimpleX Chat 開發人員提出任何問題並同意更新</font>。]]></string>
     <string name="to_start_a_new_chat_help_header">開啟新的對話</string>
     <string name="set_contact_name">設定聯絡人名稱</string>
-    <string name="you_invited_your_contact">你已邀請了你的聯絡人</string>
+    <string name="you_invited_a_contact">你已邀請了你的聯絡人</string>
     <string name="you_accepted_connection">你接受了連接</string>
     <string name="delete_pending_connection__question">刪除等待中的連接？</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">當聯絡人發現此連結後，嘗試點擊的聯絡人將無法連接！</string>