mobile: invited via group link chat item (#1239)

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -1040,6 +1040,7 @@ data class ChatItem (
           is RcvGroupEvent.MemberRole -> true
           is RcvGroupEvent.UserRole -> false
           is RcvGroupEvent.MemberDeleted -> false
+          is RcvGroupEvent.InvitedViaGroupLink -> false
         }
       is CIContent.SndGroupEventContent -> true
       else -> false
@@ -1547,6 +1548,7 @@ sealed class RcvGroupEvent() {
   @Serializable @SerialName("userDeleted") class UserDeleted(): RcvGroupEvent()
   @Serializable @SerialName("groupDeleted") class GroupDeleted(): RcvGroupEvent()
   @Serializable @SerialName("groupUpdated") class GroupUpdated(val groupProfile: GroupProfile): RcvGroupEvent()
+  @Serializable @SerialName("invitedViaGroupLink") class InvitedViaGroupLink(): RcvGroupEvent()
 
   val text: String get() = when (this) {
     is MemberAdded -> String.format(generalGetString(R.string.rcv_group_event_member_added), profile.profileViewName)
@@ -1558,6 +1560,7 @@ sealed class RcvGroupEvent() {
     is UserDeleted -> generalGetString(R.string.rcv_group_event_user_deleted)
     is GroupDeleted -> generalGetString(R.string.rcv_group_event_group_deleted)
     is GroupUpdated -> generalGetString(R.string.rcv_group_event_updated_group_profile)
+    is InvitedViaGroupLink -> generalGetString(R.string.rcv_group_event_invited_via_your_group_link)
   }
 }
 

apps/android/app/src/main/res/values-de/strings.xml

@@ -713,6 +713,7 @@
   <string name="rcv_group_event_user_deleted">hat Sie entfernt</string>
   <string name="rcv_group_event_group_deleted">Gruppe gelöscht</string>
   <string name="rcv_group_event_updated_group_profile">aktualisiertes Gruppenprofil</string>
+  <string name="rcv_group_event_invited_via_your_group_link">***invited via your group link</string>
   <string name="snd_group_event_member_deleted">Sie haben <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> entfernt.</string>
   <string name="snd_group_event_user_left">Sie haben verlassen</string>
   <string name="snd_group_event_group_profile_updated">Gruppenprofil aktualisiert</string>

apps/android/app/src/main/res/values-ru/strings.xml

@@ -713,6 +713,7 @@
     <string name="rcv_group_event_user_deleted">удалил(а) вас из группы</string>
     <string name="rcv_group_event_group_deleted">удалил(а) группу</string>
     <string name="rcv_group_event_updated_group_profile">обновил(а) профиль группы</string>
+    <string name="rcv_group_event_invited_via_your_group_link">приглашен(а) через вашу ссылку группы</string>
     <string name="snd_group_event_member_deleted">вы удалили <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
     <string name="snd_group_event_user_left">вы покинули группу</string>
     <string name="snd_group_event_group_profile_updated">профиль группы обновлен</string>

apps/android/app/src/main/res/values/strings.xml

@@ -713,6 +713,7 @@
   <string name="rcv_group_event_user_deleted">removed you</string>
   <string name="rcv_group_event_group_deleted">deleted group</string>
   <string name="rcv_group_event_updated_group_profile">updated group profile</string>
+  <string name="rcv_group_event_invited_via_your_group_link">invited via your group link</string>
   <string name="snd_group_event_member_deleted">you removed <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
   <string name="snd_group_event_user_left">you left</string>
   <string name="snd_group_event_group_profile_updated">group profile updated</string>

apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff

@@ -328,11 +328,6 @@
         <target>Anrufe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Can't delete contact!" xml:space="preserve">
-        <source>Can't delete contact!</source>
-        <target>Der Kontakt kann nicht gelöscht werden!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Can't invite contact!" xml:space="preserve">
         <source>Can't invite contact!</source>
         <target>Kontakt kann nicht eingeladen werden!</target>
@@ -538,11 +533,6 @@
         <target>Verbindungszeitüberschreitung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact %@ cannot be deleted, they are a member of the group(s) %@." xml:space="preserve">
-        <source>Contact %@ cannot be deleted, they are a member of the group(s) %@.</source>
-        <target>Der Kontakt mit %@ kann nicht gelöscht werden, da er Mitglied einer oder mehrerer dieser Gruppen ist %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Contact already exists" xml:space="preserve">
         <source>Contact already exists</source>
         <target>Der Kontakt ist bereits vorhanden</target>
@@ -2447,6 +2437,11 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Stummschaltung aufheben</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unread" xml:space="preserve">
+        <source>Unread</source>
+        <target>***Unread</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Update" xml:space="preserve">
         <source>Update</source>
         <target>Aktualisieren</target>
@@ -3036,6 +3031,11 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <target>Für eine Verbindung eingeladen</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="invited via your group link" xml:space="preserve">
+        <source>invited via your group link</source>
+        <target>***invited via your group link</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="italic" xml:space="preserve">
         <source>italic</source>
         <target>kursiv</target>

apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff

@@ -328,11 +328,6 @@
         <target>Calls</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Can't delete contact!" xml:space="preserve">
-        <source>Can't delete contact!</source>
-        <target>Can't delete contact!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Can't invite contact!" xml:space="preserve">
         <source>Can't invite contact!</source>
         <target>Can't invite contact!</target>
@@ -538,11 +533,6 @@
         <target>Connection timeout</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact %@ cannot be deleted, they are a member of the group(s) %@." xml:space="preserve">
-        <source>Contact %@ cannot be deleted, they are a member of the group(s) %@.</source>
-        <target>Contact %@ cannot be deleted, they are a member of the group(s) %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Contact already exists" xml:space="preserve">
         <source>Contact already exists</source>
         <target>Contact already exists</target>
@@ -2447,6 +2437,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Unmute</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unread" xml:space="preserve">
+        <source>Unread</source>
+        <target>Unread</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Update" xml:space="preserve">
         <source>Update</source>
         <target>Update</target>
@@ -3036,6 +3031,11 @@ SimpleX servers cannot see your profile.</target>
         <target>invited to connect</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="invited via your group link" xml:space="preserve">
+        <source>invited via your group link</source>
+        <target>invited via your group link</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="italic" xml:space="preserve">
         <source>italic</source>
         <target>italic</target>

apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff

@@ -328,11 +328,6 @@
         <target>Звонки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Can't delete contact!" xml:space="preserve">
-        <source>Can't delete contact!</source>
-        <target>Невозможно удалить контакт!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Can't invite contact!" xml:space="preserve">
         <source>Can't invite contact!</source>
         <target>Нельзя пригласить контакт!</target>
@@ -538,11 +533,6 @@
         <target>Превышено время соединения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Contact %@ cannot be deleted, they are a member of the group(s) %@." xml:space="preserve">
-        <source>Contact %@ cannot be deleted, they are a member of the group(s) %@.</source>
-        <target>Контакт %@ не может быть удален, так как является членом групп(ы) %@.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Contact already exists" xml:space="preserve">
         <source>Contact already exists</source>
         <target>Существующий контакт</target>
@@ -2447,6 +2437,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Уведомлять</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Unread" xml:space="preserve">
+        <source>Unread</source>
+        <target>Не прочитано</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Update" xml:space="preserve">
         <source>Update</source>
         <target>Обновить</target>
@@ -3036,6 +3031,11 @@ SimpleX серверы не могут получить доступ к ваше
         <target>приглашение</target>
         <note>chat list item title</note>
       </trans-unit>
+      <trans-unit id="invited via your group link" xml:space="preserve">
+        <source>invited via your group link</source>
+        <target>приглашен(а) через вашу ссылку группы</target>
+        <note>rcv group event chat item</note>
+      </trans-unit>
       <trans-unit id="italic" xml:space="preserve">
         <source>italic</source>
         <target>курсив</target>

apps/ios/SimpleXChat/ChatTypes.swift

@@ -915,6 +915,7 @@ public struct ChatItem: Identifiable, Decodable {
             case .memberAdded: return false
             case .memberLeft: return false
             case .memberDeleted: return false
+            case .invitedViaGroupLink: return false
             }
         case .sndGroupEvent: return true
         default: return false
@@ -1448,6 +1449,7 @@ public enum RcvGroupEvent: Decodable {
     case userDeleted
     case groupDeleted
     case groupUpdated(groupProfile: GroupProfile)
+    case invitedViaGroupLink
 
     var text: String {
         switch self {
@@ -1464,6 +1466,7 @@ public enum RcvGroupEvent: Decodable {
         case .userDeleted: return NSLocalizedString("removed you", comment: "rcv group event chat item")
         case .groupDeleted: return NSLocalizedString("deleted group", comment: "rcv group event chat item")
         case .groupUpdated: return NSLocalizedString("updated group profile", comment: "rcv group event chat item")
+        case .invitedViaGroupLink: return NSLocalizedString("invited via your group link", comment: "rcv group event chat item")
         }
     }
 }

apps/ios/de.lproj/Localizable.strings

@@ -233,9 +233,6 @@
 /* No comment provided by engineer. */
 "Calls" = "Anrufe";
 
-/* No comment provided by engineer. */
-"Can't delete contact!" = "Der Kontakt kann nicht gelöscht werden!";
-
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Kontakt kann nicht eingeladen werden!";
 
@@ -398,9 +395,6 @@
 /* connection information */
 "connection:%@" = "Verbindung:%@";
 
-/* No comment provided by engineer. */
-"Contact %@ cannot be deleted, they are a member of the group(s) %@." = "Der Kontakt mit %@ kann nicht gelöscht werden, da er Mitglied einer oder mehrerer dieser Gruppen ist %@.";
-
 /* No comment provided by engineer. */
 "Contact already exists" = "Der Kontakt ist bereits vorhanden";
 
@@ -983,6 +977,9 @@
 /* chat list item title */
 "invited to connect" = "Für eine Verbindung eingeladen";
 
+/* rcv group event chat item */
+"invited via your group link" = "***invited via your group link";
+
 /* No comment provided by engineer. */
 "iOS Keychain is used to securely store passphrase - it allows receiving push notifications." = "Für die sichere Speicherung des Passworts wird der iOS Schlüsselbund verwendet - dies erlaubt den Empfang von Push-Benachrichtigungen.";
 
@@ -1674,6 +1671,9 @@
 /* No comment provided by engineer. */
 "Unmute" = "Stummschaltung aufheben";
 
+/* No comment provided by engineer. */
+"Unread" = "***Unread";
+
 /* No comment provided by engineer. */
 "Update" = "Aktualisieren";
 

apps/ios/ru.lproj/Localizable.strings

@@ -233,9 +233,6 @@
 /* No comment provided by engineer. */
 "Calls" = "Звонки";
 
-/* No comment provided by engineer. */
-"Can't delete contact!" = "Невозможно удалить контакт!";
-
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Нельзя пригласить контакт!";
 
@@ -398,9 +395,6 @@
 /* connection information */
 "connection:%@" = "connection:%@";
 
-/* No comment provided by engineer. */
-"Contact %@ cannot be deleted, they are a member of the group(s) %@." = "Контакт %@ не может быть удален, так как является членом групп(ы) %@.";
-
 /* No comment provided by engineer. */
 "Contact already exists" = "Существующий контакт";
 
@@ -983,6 +977,9 @@
 /* chat list item title */
 "invited to connect" = "приглашение";
 
+/* rcv group event chat item */
+"invited via your group link" = "приглашен(а) через вашу ссылку группы";
+
 /* No comment provided by engineer. */
 "iOS Keychain is used to securely store passphrase - it allows receiving push notifications." = "iOS Keychain используется для безопасного хранения пароля - это позволяет получать мгновенные уведомления.";
 
@@ -1674,6 +1671,9 @@
 /* No comment provided by engineer. */
 "Unmute" = "Уведомлять";
 
+/* No comment provided by engineer. */
+"Unread" = "Не прочитано";
+
 /* No comment provided by engineer. */
 "Update" = "Обновить";