updated protobuf

2026-05-25 02:32:11 +00:00 · 2026-04-19 23:10:58 +02:00 · 2026-04-19 23:10:58 +02:00 · 6517473603
commit 6517473603
parent 1629b8b1a9
24 changed files with 904 additions and 739 deletions
--- a/ios/NotificationService/push_notification.pb.swift
+++ b/ios/NotificationService/push_notification.pb.swift
@ -230,12 +230,12 @@ struct PushKey: Sendable {
 // MARK: - Code below here is support for the SwiftProtobuf runtime.

 extension PushKind: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0reaction\0\u{1}response\0\u{1}text\0\u{1}video\0\u{1}twonly\0\u{1}image\0\u{1}contactRequest\0\u{1}acceptRequest\0\u{1}storedMediaFile\0\u{1}testNotification\0\u{1}reopenedMedia\0\u{1}reactionToVideo\0\u{1}reactionToText\0\u{1}reactionToImage\0\u{1}reactionToAudio\0\u{1}addedToGroup\0\u{1}audio\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0REACTION\0\u{1}RESPONSE\0\u{1}TEXT\0\u{1}VIDEO\0\u{1}TWONLY\0\u{1}IMAGE\0\u{1}CONTACT_REQUEST\0\u{1}ACCEPT_REQUEST\0\u{1}STORED_MEDIA_FILE\0\u{1}TEST_NOTIFICATION\0\u{1}REOPENED_MEDIA\0\u{1}REACTION_TO_VIDEO\0\u{1}REACTION_TO_TEXT\0\u{1}REACTION_TO_IMAGE\0\u{1}REACTION_TO_AUDIO\0\u{1}ADDED_TO_GROUP\0\u{1}AUDIO\0")
 }

 extension EncryptedPushNotification: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
  static let protoMessageName: String = "EncryptedPushNotification"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}keyId\0\u{1}nonce\0\u{1}ciphertext\0\u{1}mac\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}key_id\0\u{1}nonce\0\u{1}ciphertext\0\u{1}mac\0")

  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
    while let fieldNumber = try decoder.nextFieldNumber() {
@ -280,7 +280,7 @@ extension EncryptedPushNotification: SwiftProtobuf.Message, SwiftProtobuf._Messa

 extension PushNotification: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
  static let protoMessageName: String = "PushNotification"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}kind\0\u{1}messageId\0\u{1}additionalContent\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}kind\0\u{3}message_id\0\u{3}additional_content\0")

  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
    while let fieldNumber = try decoder.nextFieldNumber() {
@ -354,7 +354,7 @@ extension PushUsers: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation

 extension PushUser: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
  static let protoMessageName: String = "PushUser"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}userId\0\u{1}displayName\0\u{1}blocked\0\u{1}lastMessageId\0\u{1}pushKeys\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}user_id\0\u{3}display_name\0\u{1}blocked\0\u{3}last_message_id\0\u{3}push_keys\0")

  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
    while let fieldNumber = try decoder.nextFieldNumber() {
@ -408,7 +408,7 @@ extension PushUser: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB

 extension PushKey: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
  static let protoMessageName: String = "PushKey"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}id\0\u{1}key\0\u{1}createdAtUnixTimestamp\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}id\0\u{1}key\0\u{3}created_at_unix_timestamp\0")

  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
    while let fieldNumber = try decoder.nextFieldNumber() {
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -308,31 +308,6 @@ PODS:
  - sqflite_darwin (0.0.4):
    - Flutter
    - FlutterMacOS
-  - sqlite3 (3.52.0):
-    - sqlite3/common (= 3.52.0)
-  - sqlite3/common (3.52.0)
-  - sqlite3/dbstatvtab (3.52.0):
-    - sqlite3/common
-  - sqlite3/fts5 (3.52.0):
-    - sqlite3/common
-  - sqlite3/math (3.52.0):
-    - sqlite3/common
-  - sqlite3/perf-threadsafe (3.52.0):
-    - sqlite3/common
-  - sqlite3/rtree (3.52.0):
-    - sqlite3/common
-  - sqlite3/session (3.52.0):
-    - sqlite3/common
-  - sqlite3_flutter_libs (0.0.1):
-    - Flutter
-    - FlutterMacOS
-    - sqlite3 (~> 3.52.0)
-    - sqlite3/dbstatvtab
-    - sqlite3/fts5
-    - sqlite3/math
-    - sqlite3/perf-threadsafe
-    - sqlite3/rtree
-    - sqlite3/session
  - SwiftProtobuf (1.36.1)
  - SwiftyGif (5.4.5)
  - url_launcher_ios (0.0.1):
@ -386,7 +361,6 @@ DEPENDENCIES:
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
-  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
  - SwiftProtobuf
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
@ -421,7 +395,6 @@ SPEC REPOS:
    - SDWebImage
    - SDWebImageWebPCoder
    - Sentry
-    - sqlite3
    - SwiftProtobuf
    - SwiftyGif

@ -500,8 +473,6 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
  sqflite_darwin:
    :path: ".symlinks/plugins/sqflite_darwin/darwin"
-  sqlite3_flutter_libs:
-    :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
  url_launcher_ios:
    :path: ".symlinks/plugins/url_launcher_ios/ios"
  video_player_avfoundation:
@ -574,8 +545,6 @@ SPEC CHECKSUMS:
  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
-  sqlite3: a51c07cf16e023d6c48abd5e5791a61a47354921
-  sqlite3_flutter_libs: b3e120efe9a82017e5552a620f696589ed4f62ab
  SwiftProtobuf: 9e106a71456f4d3f6a3b0c8fd87ef0be085efc38
  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
--- a/lib/src/model/protobuf/client/backup.proto
+++ b/lib/src/model/protobuf/client/backup.proto
@ -1,12 +1,12 @@
 syntax = "proto3";

 message TwonlySafeBackupContent {
-    string secureStorageJson = 1;
-    bytes twonlyDatabase = 2;
+  string secure_storage_json = 1;
+  bytes  twonly_database     = 2;
 }

 message TwonlySafeBackupEncrypted {
  bytes mac         = 1;
  bytes nonce       = 2;
-    bytes cipherText = 3;
+  bytes cipher_text = 3;
 }
--- a/lib/src/model/protobuf/client/generated/backup.pb.dart
+++ b/lib/src/model/protobuf/client/generated/backup.pb.dart
@ -39,11 +39,9 @@ class TwonlySafeBackupContent extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'TwonlySafeBackupContent',
      createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'secureStorageJson',
-        protoName: 'secureStorageJson')
+    ..aOS(1, _omitFieldNames ? '' : 'secureStorageJson')
    ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'twonlyDatabase', $pb.PbFieldType.OY,
-        protoName: 'twonlyDatabase')
+        2, _omitFieldNames ? '' : 'twonlyDatabase', $pb.PbFieldType.OY)
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -118,8 +116,7 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
    ..a<$core.List<$core.int>>(
        2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
-        3, _omitFieldNames ? '' : 'cipherText', $pb.PbFieldType.OY,
-        protoName: 'cipherText')
+        3, _omitFieldNames ? '' : 'cipherText', $pb.PbFieldType.OY)
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
--- a/lib/src/model/protobuf/client/generated/backup.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/backup.pbjson.dart
@ -19,20 +19,21 @@ const TwonlySafeBackupContent$json = {
  '1': 'TwonlySafeBackupContent',
  '2': [
    {
-      '1': 'secureStorageJson',
+      '1': 'secure_storage_json',
      '3': 1,
      '4': 1,
      '5': 9,
      '10': 'secureStorageJson'
    },
-    {'1': 'twonlyDatabase', '3': 2, '4': 1, '5': 12, '10': 'twonlyDatabase'},
+    {'1': 'twonly_database', '3': 2, '4': 1, '5': 12, '10': 'twonlyDatabase'},
  ],
 };

 /// Descriptor for `TwonlySafeBackupContent`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List twonlySafeBackupContentDescriptor = $convert.base64Decode(
-    'ChdUd29ubHlTYWZlQmFja3VwQ29udGVudBIsChFzZWN1cmVTdG9yYWdlSnNvbhgBIAEoCVIRc2'
-    'VjdXJlU3RvcmFnZUpzb24SJgoOdHdvbmx5RGF0YWJhc2UYAiABKAxSDnR3b25seURhdGFiYXNl');
+    'ChdUd29ubHlTYWZlQmFja3VwQ29udGVudBIuChNzZWN1cmVfc3RvcmFnZV9qc29uGAEgASgJUh'
+    'FzZWN1cmVTdG9yYWdlSnNvbhInCg90d29ubHlfZGF0YWJhc2UYAiABKAxSDnR3b25seURhdGFi'
+    'YXNl');

@$core.Deprecated('Use twonlySafeBackupEncryptedDescriptor instead')
 const TwonlySafeBackupEncrypted$json = {
@ -40,7 +41,7 @@ const TwonlySafeBackupEncrypted$json = {
  '2': [
    {'1': 'mac', '3': 1, '4': 1, '5': 12, '10': 'mac'},
    {'1': 'nonce', '3': 2, '4': 1, '5': 12, '10': 'nonce'},
-    {'1': 'cipherText', '3': 3, '4': 1, '5': 12, '10': 'cipherText'},
+    {'1': 'cipher_text', '3': 3, '4': 1, '5': 12, '10': 'cipherText'},
  ],
 };

@ -48,4 +49,4 @@ const TwonlySafeBackupEncrypted$json = {
 final $typed_data.Uint8List twonlySafeBackupEncryptedDescriptor =
    $convert.base64Decode(
        'ChlUd29ubHlTYWZlQmFja3VwRW5jcnlwdGVkEhAKA21hYxgBIAEoDFIDbWFjEhQKBW5vbmNlGA'
-        'IgASgMUgVub25jZRIeCgpjaXBoZXJUZXh0GAMgASgMUgpjaXBoZXJUZXh0');
+        'IgASgMUgVub25jZRIfCgtjaXBoZXJfdGV4dBgDIAEoDFIKY2lwaGVyVGV4dA==');
--- a/lib/src/model/protobuf/client/generated/groups.pb.dart
+++ b/lib/src/model/protobuf/client/generated/groups.pb.dart
@ -53,13 +53,10 @@ class EncryptedGroupState extends $pb.GeneratedMessage {
      _omitMessageNames ? '' : 'EncryptedGroupState',
      createEmptyInstance: create)
    ..p<$fixnum.Int64>(
-        1, _omitFieldNames ? '' : 'memberIds', $pb.PbFieldType.K6,
-        protoName: 'memberIds')
-    ..p<$fixnum.Int64>(2, _omitFieldNames ? '' : 'adminIds', $pb.PbFieldType.K6,
-        protoName: 'adminIds')
-    ..aOS(3, _omitFieldNames ? '' : 'groupName', protoName: 'groupName')
-    ..aInt64(4, _omitFieldNames ? '' : 'deleteMessagesAfterMilliseconds',
-        protoName: 'deleteMessagesAfterMilliseconds')
+        1, _omitFieldNames ? '' : 'memberIds', $pb.PbFieldType.K6)
+    ..p<$fixnum.Int64>(2, _omitFieldNames ? '' : 'adminIds', $pb.PbFieldType.K6)
+    ..aOS(3, _omitFieldNames ? '' : 'groupName')
+    ..aInt64(4, _omitFieldNames ? '' : 'deleteMessagesAfterMilliseconds')
    ..a<$core.List<$core.int>>(
        5, _omitFieldNames ? '' : 'padding', $pb.PbFieldType.OY)
    ..hasRequiredFields = false;
@ -212,8 +209,7 @@ class EncryptedGroupStateEnvelop extends $pb.GeneratedMessage {
    ..a<$core.List<$core.int>>(
        1, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'encryptedGroupState', $pb.PbFieldType.OY,
-        protoName: 'encryptedGroupState')
+        2, _omitFieldNames ? '' : 'encryptedGroupState', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
        3, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
    ..hasRequiredFields = false;
--- a/lib/src/model/protobuf/client/generated/groups.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/groups.pbjson.dart
@ -18,11 +18,11 @@ import 'dart:typed_data' as $typed_data;
 const EncryptedGroupState$json = {
  '1': 'EncryptedGroupState',
  '2': [
-    {'1': 'memberIds', '3': 1, '4': 3, '5': 3, '10': 'memberIds'},
-    {'1': 'adminIds', '3': 2, '4': 3, '5': 3, '10': 'adminIds'},
-    {'1': 'groupName', '3': 3, '4': 1, '5': 9, '10': 'groupName'},
+    {'1': 'member_ids', '3': 1, '4': 3, '5': 3, '10': 'memberIds'},
+    {'1': 'admin_ids', '3': 2, '4': 3, '5': 3, '10': 'adminIds'},
+    {'1': 'group_name', '3': 3, '4': 1, '5': 9, '10': 'groupName'},
    {
-      '1': 'deleteMessagesAfterMilliseconds',
+      '1': 'delete_messages_after_milliseconds',
      '3': 4,
      '4': 1,
      '5': 3,
@ -33,17 +33,17 @@ const EncryptedGroupState$json = {
    {'1': 'padding', '3': 5, '4': 1, '5': 12, '10': 'padding'},
  ],
  '8': [
-    {'1': '_deleteMessagesAfterMilliseconds'},
+    {'1': '_delete_messages_after_milliseconds'},
  ],
 };

 /// Descriptor for `EncryptedGroupState`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedGroupStateDescriptor = $convert.base64Decode(
-    'ChNFbmNyeXB0ZWRHcm91cFN0YXRlEhwKCW1lbWJlcklkcxgBIAMoA1IJbWVtYmVySWRzEhoKCG'
-    'FkbWluSWRzGAIgAygDUghhZG1pbklkcxIcCglncm91cE5hbWUYAyABKAlSCWdyb3VwTmFtZRJN'
-    'Ch9kZWxldGVNZXNzYWdlc0FmdGVyTWlsbGlzZWNvbmRzGAQgASgDSABSH2RlbGV0ZU1lc3NhZ2'
-    'VzQWZ0ZXJNaWxsaXNlY29uZHOIAQESGAoHcGFkZGluZxgFIAEoDFIHcGFkZGluZ0IiCiBfZGVs'
-    'ZXRlTWVzc2FnZXNBZnRlck1pbGxpc2Vjb25kcw==');
+    'ChNFbmNyeXB0ZWRHcm91cFN0YXRlEh0KCm1lbWJlcl9pZHMYASADKANSCW1lbWJlcklkcxIbCg'
+    'lhZG1pbl9pZHMYAiADKANSCGFkbWluSWRzEh0KCmdyb3VwX25hbWUYAyABKAlSCWdyb3VwTmFt'
+    'ZRJQCiJkZWxldGVfbWVzc2FnZXNfYWZ0ZXJfbWlsbGlzZWNvbmRzGAQgASgDSABSH2RlbGV0ZU'
+    '1lc3NhZ2VzQWZ0ZXJNaWxsaXNlY29uZHOIAQESGAoHcGFkZGluZxgFIAEoDFIHcGFkZGluZ0Il'
+    'CiNfZGVsZXRlX21lc3NhZ2VzX2FmdGVyX21pbGxpc2Vjb25kcw==');

@$core.Deprecated('Use encryptedAppendedGroupStateDescriptor instead')
 const EncryptedAppendedGroupState$json = {
@ -81,7 +81,7 @@ const EncryptedGroupStateEnvelop$json = {
  '2': [
    {'1': 'nonce', '3': 1, '4': 1, '5': 12, '10': 'nonce'},
    {
-      '1': 'encryptedGroupState',
+      '1': 'encrypted_group_state',
      '3': 2,
      '4': 1,
      '5': 12,
@ -94,6 +94,6 @@ const EncryptedGroupStateEnvelop$json = {
 /// Descriptor for `EncryptedGroupStateEnvelop`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedGroupStateEnvelopDescriptor =
    $convert.base64Decode(
-        'ChpFbmNyeXB0ZWRHcm91cFN0YXRlRW52ZWxvcBIUCgVub25jZRgBIAEoDFIFbm9uY2USMAoTZW'
-        '5jcnlwdGVkR3JvdXBTdGF0ZRgCIAEoDFITZW5jcnlwdGVkR3JvdXBTdGF0ZRIQCgNtYWMYAyAB'
-        'KAxSA21hYw==');
+        'ChpFbmNyeXB0ZWRHcm91cFN0YXRlRW52ZWxvcBIUCgVub25jZRgBIAEoDFIFbm9uY2USMgoVZW'
+        '5jcnlwdGVkX2dyb3VwX3N0YXRlGAIgASgMUhNlbmNyeXB0ZWRHcm91cFN0YXRlEhAKA21hYxgD'
+        'IAEoDFIDbWFj');
--- a/lib/src/model/protobuf/client/generated/messages.pb.dart
+++ b/lib/src/model/protobuf/client/generated/messages.pb.dart
@ -52,12 +52,11 @@ class Message extends $pb.GeneratedMessage {
        defaultOrMaker: Message_Type.SENDER_DELIVERY_RECEIPT,
        valueOf: Message_Type.valueOf,
        enumValues: Message_Type.values)
-    ..aOS(2, _omitFieldNames ? '' : 'receiptId', protoName: 'receiptId')
+    ..aOS(2, _omitFieldNames ? '' : 'receiptId')
    ..a<$core.List<$core.int>>(
-        3, _omitFieldNames ? '' : 'encryptedContent', $pb.PbFieldType.OY,
-        protoName: 'encryptedContent')
+        3, _omitFieldNames ? '' : 'encryptedContent', $pb.PbFieldType.OY)
    ..aOM<PlaintextContent>(4, _omitFieldNames ? '' : 'plaintextContent',
-        protoName: 'plaintextContent', subBuilder: PlaintextContent.create)
+        subBuilder: PlaintextContent.create)
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -255,11 +254,9 @@ class PlaintextContent extends $pb.GeneratedMessage {
      createEmptyInstance: create)
    ..aOM<PlaintextContent_DecryptionErrorMessage>(
        1, _omitFieldNames ? '' : 'decryptionErrorMessage',
-        protoName: 'decryptionErrorMessage',
        subBuilder: PlaintextContent_DecryptionErrorMessage.create)
    ..aOM<PlaintextContent_RetryErrorMessage>(
        2, _omitFieldNames ? '' : 'retryControlError',
-        protoName: 'retryControlError',
        subBuilder: PlaintextContent_RetryErrorMessage.create)
    ..hasRequiredFields = false;

@ -411,11 +408,9 @@ class EncryptedContent_GroupCreate extends $pb.GeneratedMessage {
      _omitMessageNames ? '' : 'EncryptedContent.GroupCreate',
      createEmptyInstance: create)
    ..a<$core.List<$core.int>>(
-        3, _omitFieldNames ? '' : 'stateKey', $pb.PbFieldType.OY,
-        protoName: 'stateKey')
+        3, _omitFieldNames ? '' : 'stateKey', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
-        4, _omitFieldNames ? '' : 'groupPublicKey', $pb.PbFieldType.OY,
-        protoName: 'groupPublicKey')
+        4, _omitFieldNames ? '' : 'groupPublicKey', $pb.PbFieldType.OY)
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -485,8 +480,7 @@ class EncryptedContent_GroupJoin extends $pb.GeneratedMessage {
      _omitMessageNames ? '' : 'EncryptedContent.GroupJoin',
      createEmptyInstance: create)
    ..a<$core.List<$core.int>>(
-        1, _omitFieldNames ? '' : 'groupPublicKey', $pb.PbFieldType.OY,
-        protoName: 'groupPublicKey')
+        1, _omitFieldNames ? '' : 'groupPublicKey', $pb.PbFieldType.OY)
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -598,13 +592,10 @@ class EncryptedContent_GroupUpdate extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'EncryptedContent.GroupUpdate',
      createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'groupActionType',
-        protoName: 'groupActionType')
-    ..aInt64(2, _omitFieldNames ? '' : 'affectedContactId',
-        protoName: 'affectedContactId')
-    ..aOS(3, _omitFieldNames ? '' : 'newGroupName', protoName: 'newGroupName')
-    ..aInt64(4, _omitFieldNames ? '' : 'newDeleteMessagesAfterMilliseconds',
-        protoName: 'newDeleteMessagesAfterMilliseconds')
+    ..aOS(1, _omitFieldNames ? '' : 'groupActionType')
+    ..aInt64(2, _omitFieldNames ? '' : 'affectedContactId')
+    ..aOS(3, _omitFieldNames ? '' : 'newGroupName')
+    ..aInt64(4, _omitFieldNames ? '' : 'newDeleteMessagesAfterMilliseconds')
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -697,12 +688,10 @@ class EncryptedContent_TextMessage extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'EncryptedContent.TextMessage',
      createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'senderMessageId',
-        protoName: 'senderMessageId')
+    ..aOS(1, _omitFieldNames ? '' : 'senderMessageId')
    ..aOS(2, _omitFieldNames ? '' : 'text')
    ..aInt64(3, _omitFieldNames ? '' : 'timestamp')
-    ..aOS(4, _omitFieldNames ? '' : 'quoteMessageId',
-        protoName: 'quoteMessageId')
+    ..aOS(4, _omitFieldNames ? '' : 'quoteMessageId')
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -892,8 +881,7 @@ class EncryptedContent_Reaction extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'EncryptedContent.Reaction',
      createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'targetMessageId',
-        protoName: 'targetMessageId')
+    ..aOS(1, _omitFieldNames ? '' : 'targetMessageId')
    ..aOS(2, _omitFieldNames ? '' : 'emoji')
    ..aOB(3, _omitFieldNames ? '' : 'remove')
    ..hasRequiredFields = false;
@ -984,10 +972,8 @@ class EncryptedContent_MessageUpdate extends $pb.GeneratedMessage {
        defaultOrMaker: EncryptedContent_MessageUpdate_Type.DELETE,
        valueOf: EncryptedContent_MessageUpdate_Type.valueOf,
        enumValues: EncryptedContent_MessageUpdate_Type.values)
-    ..aOS(2, _omitFieldNames ? '' : 'senderMessageId',
-        protoName: 'senderMessageId')
-    ..pPS(3, _omitFieldNames ? '' : 'multipleTargetMessageIds',
-        protoName: 'multipleTargetMessageIds')
+    ..aOS(2, _omitFieldNames ? '' : 'senderMessageId')
+    ..pPS(3, _omitFieldNames ? '' : 'multipleTargetMessageIds')
    ..aOS(4, _omitFieldNames ? '' : 'text')
    ..aInt64(5, _omitFieldNames ? '' : 'timestamp')
    ..hasRequiredFields = false;
@ -1101,32 +1087,24 @@ class EncryptedContent_Media extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'EncryptedContent.Media',
      createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'senderMessageId',
-        protoName: 'senderMessageId')
+    ..aOS(1, _omitFieldNames ? '' : 'senderMessageId')
    ..e<EncryptedContent_Media_Type>(
        2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
        defaultOrMaker: EncryptedContent_Media_Type.REUPLOAD,
        valueOf: EncryptedContent_Media_Type.valueOf,
        enumValues: EncryptedContent_Media_Type.values)
-    ..aInt64(3, _omitFieldNames ? '' : 'displayLimitInMilliseconds',
-        protoName: 'displayLimitInMilliseconds')
-    ..aOB(4, _omitFieldNames ? '' : 'requiresAuthentication',
-        protoName: 'requiresAuthentication')
+    ..aInt64(3, _omitFieldNames ? '' : 'displayLimitInMilliseconds')
+    ..aOB(4, _omitFieldNames ? '' : 'requiresAuthentication')
    ..aInt64(5, _omitFieldNames ? '' : 'timestamp')
-    ..aOS(6, _omitFieldNames ? '' : 'quoteMessageId',
-        protoName: 'quoteMessageId')
+    ..aOS(6, _omitFieldNames ? '' : 'quoteMessageId')
    ..a<$core.List<$core.int>>(
-        7, _omitFieldNames ? '' : 'downloadToken', $pb.PbFieldType.OY,
-        protoName: 'downloadToken')
+        7, _omitFieldNames ? '' : 'downloadToken', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
-        8, _omitFieldNames ? '' : 'encryptionKey', $pb.PbFieldType.OY,
-        protoName: 'encryptionKey')
+        8, _omitFieldNames ? '' : 'encryptionKey', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
-        9, _omitFieldNames ? '' : 'encryptionMac', $pb.PbFieldType.OY,
-        protoName: 'encryptionMac')
+        9, _omitFieldNames ? '' : 'encryptionMac', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
-        10, _omitFieldNames ? '' : 'encryptionNonce', $pb.PbFieldType.OY,
-        protoName: 'encryptionNonce')
+        10, _omitFieldNames ? '' : 'encryptionNonce', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
        11, _omitFieldNames ? '' : 'additionalMessageData', $pb.PbFieldType.OY)
    ..hasRequiredFields = false;
@ -1283,8 +1261,7 @@ class EncryptedContent_MediaUpdate extends $pb.GeneratedMessage {
        defaultOrMaker: EncryptedContent_MediaUpdate_Type.REOPENED,
        valueOf: EncryptedContent_MediaUpdate_Type.valueOf,
        enumValues: EncryptedContent_MediaUpdate_Type.values)
-    ..aOS(2, _omitFieldNames ? '' : 'targetMessageId',
-        protoName: 'targetMessageId')
+    ..aOS(2, _omitFieldNames ? '' : 'targetMessageId')
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -1429,10 +1406,9 @@ class EncryptedContent_ContactUpdate extends $pb.GeneratedMessage {
        valueOf: EncryptedContent_ContactUpdate_Type.valueOf,
        enumValues: EncryptedContent_ContactUpdate_Type.values)
    ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'avatarSvgCompressed', $pb.PbFieldType.OY,
-        protoName: 'avatarSvgCompressed')
+        2, _omitFieldNames ? '' : 'avatarSvgCompressed', $pb.PbFieldType.OY)
    ..aOS(3, _omitFieldNames ? '' : 'username')
-    ..aOS(4, _omitFieldNames ? '' : 'displayName', protoName: 'displayName')
+    ..aOS(4, _omitFieldNames ? '' : 'displayName')
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -1529,10 +1505,10 @@ class EncryptedContent_PushKeys extends $pb.GeneratedMessage {
        defaultOrMaker: EncryptedContent_PushKeys_Type.REQUEST,
        valueOf: EncryptedContent_PushKeys_Type.valueOf,
        enumValues: EncryptedContent_PushKeys_Type.values)
-    ..aInt64(2, _omitFieldNames ? '' : 'keyId', protoName: 'keyId')
+    ..aInt64(2, _omitFieldNames ? '' : 'keyId')
    ..a<$core.List<$core.int>>(
        3, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
-    ..aInt64(4, _omitFieldNames ? '' : 'createdAt', protoName: 'createdAt')
+    ..aInt64(4, _omitFieldNames ? '' : 'createdAt')
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -1623,12 +1599,10 @@ class EncryptedContent_FlameSync extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'EncryptedContent.FlameSync',
      createEmptyInstance: create)
-    ..aInt64(1, _omitFieldNames ? '' : 'flameCounter',
-        protoName: 'flameCounter')
-    ..aInt64(2, _omitFieldNames ? '' : 'lastFlameCounterChange',
-        protoName: 'lastFlameCounterChange')
-    ..aOB(3, _omitFieldNames ? '' : 'bestFriend', protoName: 'bestFriend')
-    ..aOB(4, _omitFieldNames ? '' : 'forceUpdate', protoName: 'forceUpdate')
+    ..aInt64(1, _omitFieldNames ? '' : 'flameCounter')
+    ..aInt64(2, _omitFieldNames ? '' : 'lastFlameCounterChange')
+    ..aOB(3, _omitFieldNames ? '' : 'bestFriend')
+    ..aOB(4, _omitFieldNames ? '' : 'forceUpdate')
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -1765,6 +1739,124 @@ class EncryptedContent_TypingIndicator extends $pb.GeneratedMessage {
  void clearCreatedAt() => $_clearField(2);
 }

+class EncryptedContent_UserDiscoveryRequest extends $pb.GeneratedMessage {
+  factory EncryptedContent_UserDiscoveryRequest({
+    $core.List<$core.int>? currentVersion,
+  }) {
+    final result = create();
+    if (currentVersion != null) result.currentVersion = currentVersion;
+    return result;
+  }
+
+  EncryptedContent_UserDiscoveryRequest._();
+
+  factory EncryptedContent_UserDiscoveryRequest.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EncryptedContent_UserDiscoveryRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedContent.UserDiscoveryRequest',
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'currentVersion', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_UserDiscoveryRequest clone() =>
+      EncryptedContent_UserDiscoveryRequest()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_UserDiscoveryRequest copyWith(
+          void Function(EncryptedContent_UserDiscoveryRequest) updates) =>
+      super.copyWith((message) =>
+              updates(message as EncryptedContent_UserDiscoveryRequest))
+          as EncryptedContent_UserDiscoveryRequest;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_UserDiscoveryRequest create() =>
+      EncryptedContent_UserDiscoveryRequest._();
+  @$core.override
+  EncryptedContent_UserDiscoveryRequest createEmptyInstance() => create();
+  static $pb.PbList<EncryptedContent_UserDiscoveryRequest> createRepeated() =>
+      $pb.PbList<EncryptedContent_UserDiscoveryRequest>();
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_UserDiscoveryRequest getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          EncryptedContent_UserDiscoveryRequest>(create);
+  static EncryptedContent_UserDiscoveryRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<$core.int> get currentVersion => $_getN(0);
+  @$pb.TagNumber(1)
+  set currentVersion($core.List<$core.int> value) => $_setBytes(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasCurrentVersion() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearCurrentVersion() => $_clearField(1);
+}
+
+class EncryptedContent_UserDiscoveryUpdate extends $pb.GeneratedMessage {
+  factory EncryptedContent_UserDiscoveryUpdate({
+    $core.Iterable<$core.List<$core.int>>? messages,
+  }) {
+    final result = create();
+    if (messages != null) result.messages.addAll(messages);
+    return result;
+  }
+
+  EncryptedContent_UserDiscoveryUpdate._();
+
+  factory EncryptedContent_UserDiscoveryUpdate.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EncryptedContent_UserDiscoveryUpdate.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedContent.UserDiscoveryUpdate',
+      createEmptyInstance: create)
+    ..p<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'messages', $pb.PbFieldType.PY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_UserDiscoveryUpdate clone() =>
+      EncryptedContent_UserDiscoveryUpdate()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_UserDiscoveryUpdate copyWith(
+          void Function(EncryptedContent_UserDiscoveryUpdate) updates) =>
+      super.copyWith((message) =>
+              updates(message as EncryptedContent_UserDiscoveryUpdate))
+          as EncryptedContent_UserDiscoveryUpdate;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_UserDiscoveryUpdate create() =>
+      EncryptedContent_UserDiscoveryUpdate._();
+  @$core.override
+  EncryptedContent_UserDiscoveryUpdate createEmptyInstance() => create();
+  static $pb.PbList<EncryptedContent_UserDiscoveryUpdate> createRepeated() =>
+      $pb.PbList<EncryptedContent_UserDiscoveryUpdate>();
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_UserDiscoveryUpdate getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          EncryptedContent_UserDiscoveryUpdate>(create);
+  static EncryptedContent_UserDiscoveryUpdate? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $pb.PbList<$core.List<$core.int>> get messages => $_getList(0);
+}
+
 class EncryptedContent extends $pb.GeneratedMessage {
  factory EncryptedContent({
    $core.String? groupId,
@ -1786,6 +1878,9 @@ class EncryptedContent extends $pb.GeneratedMessage {
    EncryptedContent_ErrorMessages? errorMessages,
    EncryptedContent_AdditionalDataMessage? additionalDataMessage,
    EncryptedContent_TypingIndicator? typingIndicator,
+    $core.List<$core.int>? senderUserDiscoveryVersion,
+    EncryptedContent_UserDiscoveryRequest? userDiscoveryRequest,
+    EncryptedContent_UserDiscoveryUpdate? userDiscoveryUpdate,
  }) {
    final result = create();
    if (groupId != null) result.groupId = groupId;
@ -1810,6 +1905,12 @@ class EncryptedContent extends $pb.GeneratedMessage {
    if (additionalDataMessage != null)
      result.additionalDataMessage = additionalDataMessage;
    if (typingIndicator != null) result.typingIndicator = typingIndicator;
+    if (senderUserDiscoveryVersion != null)
+      result.senderUserDiscoveryVersion = senderUserDiscoveryVersion;
+    if (userDiscoveryRequest != null)
+      result.userDiscoveryRequest = userDiscoveryRequest;
+    if (userDiscoveryUpdate != null)
+      result.userDiscoveryUpdate = userDiscoveryUpdate;
    return result;
  }

@ -1825,50 +1926,41 @@ class EncryptedContent extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'EncryptedContent',
      createEmptyInstance: create)
-    ..aOS(2, _omitFieldNames ? '' : 'groupId', protoName: 'groupId')
-    ..aOB(3, _omitFieldNames ? '' : 'isDirectChat', protoName: 'isDirectChat')
-    ..aInt64(4, _omitFieldNames ? '' : 'senderProfileCounter',
-        protoName: 'senderProfileCounter')
+    ..aOS(2, _omitFieldNames ? '' : 'groupId')
+    ..aOB(3, _omitFieldNames ? '' : 'isDirectChat')
+    ..aInt64(4, _omitFieldNames ? '' : 'senderProfileCounter')
    ..aOM<EncryptedContent_MessageUpdate>(
        5, _omitFieldNames ? '' : 'messageUpdate',
-        protoName: 'messageUpdate',
        subBuilder: EncryptedContent_MessageUpdate.create)
    ..aOM<EncryptedContent_Media>(6, _omitFieldNames ? '' : 'media',
        subBuilder: EncryptedContent_Media.create)
    ..aOM<EncryptedContent_MediaUpdate>(7, _omitFieldNames ? '' : 'mediaUpdate',
-        protoName: 'mediaUpdate',
        subBuilder: EncryptedContent_MediaUpdate.create)
    ..aOM<EncryptedContent_ContactUpdate>(
        8, _omitFieldNames ? '' : 'contactUpdate',
-        protoName: 'contactUpdate',
        subBuilder: EncryptedContent_ContactUpdate.create)
    ..aOM<EncryptedContent_ContactRequest>(
        9, _omitFieldNames ? '' : 'contactRequest',
-        protoName: 'contactRequest',
        subBuilder: EncryptedContent_ContactRequest.create)
    ..aOM<EncryptedContent_FlameSync>(10, _omitFieldNames ? '' : 'flameSync',
-        protoName: 'flameSync', subBuilder: EncryptedContent_FlameSync.create)
+        subBuilder: EncryptedContent_FlameSync.create)
    ..aOM<EncryptedContent_PushKeys>(11, _omitFieldNames ? '' : 'pushKeys',
-        protoName: 'pushKeys', subBuilder: EncryptedContent_PushKeys.create)
+        subBuilder: EncryptedContent_PushKeys.create)
    ..aOM<EncryptedContent_Reaction>(12, _omitFieldNames ? '' : 'reaction',
        subBuilder: EncryptedContent_Reaction.create)
    ..aOM<EncryptedContent_TextMessage>(
        13, _omitFieldNames ? '' : 'textMessage',
-        protoName: 'textMessage',
        subBuilder: EncryptedContent_TextMessage.create)
    ..aOM<EncryptedContent_GroupCreate>(
        14, _omitFieldNames ? '' : 'groupCreate',
-        protoName: 'groupCreate',
        subBuilder: EncryptedContent_GroupCreate.create)
    ..aOM<EncryptedContent_GroupJoin>(15, _omitFieldNames ? '' : 'groupJoin',
-        protoName: 'groupJoin', subBuilder: EncryptedContent_GroupJoin.create)
+        subBuilder: EncryptedContent_GroupJoin.create)
    ..aOM<EncryptedContent_GroupUpdate>(
        16, _omitFieldNames ? '' : 'groupUpdate',
-        protoName: 'groupUpdate',
        subBuilder: EncryptedContent_GroupUpdate.create)
    ..aOM<EncryptedContent_ResendGroupPublicKey>(
        17, _omitFieldNames ? '' : 'resendGroupPublicKey',
-        protoName: 'resendGroupPublicKey',
        subBuilder: EncryptedContent_ResendGroupPublicKey.create)
    ..aOM<EncryptedContent_ErrorMessages>(
        18, _omitFieldNames ? '' : 'errorMessages',
@ -1879,6 +1971,14 @@ class EncryptedContent extends $pb.GeneratedMessage {
    ..aOM<EncryptedContent_TypingIndicator>(
        20, _omitFieldNames ? '' : 'typingIndicator',
        subBuilder: EncryptedContent_TypingIndicator.create)
+    ..a<$core.List<$core.int>>(21,
+        _omitFieldNames ? '' : 'senderUserDiscoveryVersion', $pb.PbFieldType.OY)
+    ..aOM<EncryptedContent_UserDiscoveryRequest>(
+        22, _omitFieldNames ? '' : 'userDiscoveryRequest',
+        subBuilder: EncryptedContent_UserDiscoveryRequest.create)
+    ..aOM<EncryptedContent_UserDiscoveryUpdate>(
+        23, _omitFieldNames ? '' : 'userDiscoveryUpdate',
+        subBuilder: EncryptedContent_UserDiscoveryUpdate.create)
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -2115,6 +2215,42 @@ class EncryptedContent extends $pb.GeneratedMessage {
  void clearTypingIndicator() => $_clearField(20);
  @$pb.TagNumber(20)
  EncryptedContent_TypingIndicator ensureTypingIndicator() => $_ensure(18);
+
+  @$pb.TagNumber(21)
+  $core.List<$core.int> get senderUserDiscoveryVersion => $_getN(19);
+  @$pb.TagNumber(21)
+  set senderUserDiscoveryVersion($core.List<$core.int> value) =>
+      $_setBytes(19, value);
+  @$pb.TagNumber(21)
+  $core.bool hasSenderUserDiscoveryVersion() => $_has(19);
+  @$pb.TagNumber(21)
+  void clearSenderUserDiscoveryVersion() => $_clearField(21);
+
+  @$pb.TagNumber(22)
+  EncryptedContent_UserDiscoveryRequest get userDiscoveryRequest => $_getN(20);
+  @$pb.TagNumber(22)
+  set userDiscoveryRequest(EncryptedContent_UserDiscoveryRequest value) =>
+      $_setField(22, value);
+  @$pb.TagNumber(22)
+  $core.bool hasUserDiscoveryRequest() => $_has(20);
+  @$pb.TagNumber(22)
+  void clearUserDiscoveryRequest() => $_clearField(22);
+  @$pb.TagNumber(22)
+  EncryptedContent_UserDiscoveryRequest ensureUserDiscoveryRequest() =>
+      $_ensure(20);
+
+  @$pb.TagNumber(23)
+  EncryptedContent_UserDiscoveryUpdate get userDiscoveryUpdate => $_getN(21);
+  @$pb.TagNumber(23)
+  set userDiscoveryUpdate(EncryptedContent_UserDiscoveryUpdate value) =>
+      $_setField(23, value);
+  @$pb.TagNumber(23)
+  $core.bool hasUserDiscoveryUpdate() => $_has(21);
+  @$pb.TagNumber(23)
+  void clearUserDiscoveryUpdate() => $_clearField(23);
+  @$pb.TagNumber(23)
+  EncryptedContent_UserDiscoveryUpdate ensureUserDiscoveryUpdate() =>
+      $_ensure(21);
 }

 const $core.bool _omitFieldNames =
--- a/lib/src/model/protobuf/client/generated/messages.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/messages.pbjson.dart
@ -19,9 +19,9 @@ const Message$json = {
  '1': 'Message',
  '2': [
    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.Message.Type', '10': 'type'},
-    {'1': 'receiptId', '3': 2, '4': 1, '5': 9, '10': 'receiptId'},
+    {'1': 'receipt_id', '3': 2, '4': 1, '5': 9, '10': 'receiptId'},
    {
-      '1': 'encryptedContent',
+      '1': 'encrypted_content',
      '3': 3,
      '4': 1,
      '5': 12,
@ -30,7 +30,7 @@ const Message$json = {
      '17': true
    },
    {
-      '1': 'plaintextContent',
+      '1': 'plaintext_content',
      '3': 4,
      '4': 1,
      '5': 11,
@ -42,8 +42,8 @@ const Message$json = {
  ],
  '4': [Message_Type$json],
  '8': [
-    {'1': '_encryptedContent'},
-    {'1': '_plaintextContent'},
+    {'1': '_encrypted_content'},
+    {'1': '_plaintext_content'},
  ],
 };

@ -61,20 +61,20 @@ const Message_Type$json = {

 /// Descriptor for `Message`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List messageDescriptor = $convert.base64Decode(
-    'CgdNZXNzYWdlEiEKBHR5cGUYASABKA4yDS5NZXNzYWdlLlR5cGVSBHR5cGUSHAoJcmVjZWlwdE'
-    'lkGAIgASgJUglyZWNlaXB0SWQSLwoQZW5jcnlwdGVkQ29udGVudBgDIAEoDEgAUhBlbmNyeXB0'
-    'ZWRDb250ZW50iAEBEkIKEHBsYWludGV4dENvbnRlbnQYBCABKAsyES5QbGFpbnRleHRDb250ZW'
-    '50SAFSEHBsYWludGV4dENvbnRlbnSIAQEidAoEVHlwZRIbChdTRU5ERVJfREVMSVZFUllfUkVD'
-    'RUlQVBAAEhUKEVBMQUlOVEVYVF9DT05URU5UEAESDgoKQ0lQSEVSVEVYVBACEhEKDVBSRUtFWV'
-    '9CVU5ETEUQAxIVChFURVNUX05PVElGSUNBVElPThAEQhMKEV9lbmNyeXB0ZWRDb250ZW50QhMK'
-    'EV9wbGFpbnRleHRDb250ZW50');
+    'CgdNZXNzYWdlEiEKBHR5cGUYASABKA4yDS5NZXNzYWdlLlR5cGVSBHR5cGUSHQoKcmVjZWlwdF'
+    '9pZBgCIAEoCVIJcmVjZWlwdElkEjAKEWVuY3J5cHRlZF9jb250ZW50GAMgASgMSABSEGVuY3J5'
+    'cHRlZENvbnRlbnSIAQESQwoRcGxhaW50ZXh0X2NvbnRlbnQYBCABKAsyES5QbGFpbnRleHRDb2'
+    '50ZW50SAFSEHBsYWludGV4dENvbnRlbnSIAQEidAoEVHlwZRIbChdTRU5ERVJfREVMSVZFUllf'
+    'UkVDRUlQVBAAEhUKEVBMQUlOVEVYVF9DT05URU5UEAESDgoKQ0lQSEVSVEVYVBACEhEKDVBSRU'
+    'tFWV9CVU5ETEUQAxIVChFURVNUX05PVElGSUNBVElPThAEQhQKEl9lbmNyeXB0ZWRfY29udGVu'
+    'dEIUChJfcGxhaW50ZXh0X2NvbnRlbnQ=');

@$core.Deprecated('Use plaintextContentDescriptor instead')
 const PlaintextContent$json = {
  '1': 'PlaintextContent',
  '2': [
    {
-      '1': 'decryptionErrorMessage',
+      '1': 'decryption_error_message',
      '3': 1,
      '4': 1,
      '5': 11,
@ -84,7 +84,7 @@ const PlaintextContent$json = {
      '17': true
    },
    {
-      '1': 'retryControlError',
+      '1': 'retry_control_error',
      '3': 2,
      '4': 1,
      '5': 11,
@ -99,8 +99,8 @@ const PlaintextContent$json = {
    PlaintextContent_DecryptionErrorMessage$json
  ],
  '8': [
-    {'1': '_decryptionErrorMessage'},
-    {'1': '_retryControlError'},
+    {'1': '_decryption_error_message'},
+    {'1': '_retry_control_error'},
  ],
 };

@ -136,21 +136,21 @@ const PlaintextContent_DecryptionErrorMessage_Type$json = {

 /// Descriptor for `PlaintextContent`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List plaintextContentDescriptor = $convert.base64Decode(
-    'ChBQbGFpbnRleHRDb250ZW50EmUKFmRlY3J5cHRpb25FcnJvck1lc3NhZ2UYASABKAsyKC5QbG'
-    'FpbnRleHRDb250ZW50LkRlY3J5cHRpb25FcnJvck1lc3NhZ2VIAFIWZGVjcnlwdGlvbkVycm9y'
-    'TWVzc2FnZYgBARJWChFyZXRyeUNvbnRyb2xFcnJvchgCIAEoCzIjLlBsYWludGV4dENvbnRlbn'
-    'QuUmV0cnlFcnJvck1lc3NhZ2VIAVIRcmV0cnlDb250cm9sRXJyb3KIAQEaEwoRUmV0cnlFcnJv'
-    'ck1lc3NhZ2UahAEKFkRlY3J5cHRpb25FcnJvck1lc3NhZ2USQQoEdHlwZRgBIAEoDjItLlBsYW'
-    'ludGV4dENvbnRlbnQuRGVjcnlwdGlvbkVycm9yTWVzc2FnZS5UeXBlUgR0eXBlIicKBFR5cGUS'
-    'CwoHVU5LTk9XThAAEhIKDlBSRUtFWV9VTktOT1dOEAFCGQoXX2RlY3J5cHRpb25FcnJvck1lc3'
-    'NhZ2VCFAoSX3JldHJ5Q29udHJvbEVycm9y');
+    'ChBQbGFpbnRleHRDb250ZW50EmcKGGRlY3J5cHRpb25fZXJyb3JfbWVzc2FnZRgBIAEoCzIoLl'
+    'BsYWludGV4dENvbnRlbnQuRGVjcnlwdGlvbkVycm9yTWVzc2FnZUgAUhZkZWNyeXB0aW9uRXJy'
+    'b3JNZXNzYWdliAEBElgKE3JldHJ5X2NvbnRyb2xfZXJyb3IYAiABKAsyIy5QbGFpbnRleHRDb2'
+    '50ZW50LlJldHJ5RXJyb3JNZXNzYWdlSAFSEXJldHJ5Q29udHJvbEVycm9yiAEBGhMKEVJldHJ5'
+    'RXJyb3JNZXNzYWdlGoQBChZEZWNyeXB0aW9uRXJyb3JNZXNzYWdlEkEKBHR5cGUYASABKA4yLS'
+    '5QbGFpbnRleHRDb250ZW50LkRlY3J5cHRpb25FcnJvck1lc3NhZ2UuVHlwZVIEdHlwZSInCgRU'
+    'eXBlEgsKB1VOS05PV04QABISCg5QUkVLRVlfVU5LTk9XThABQhsKGV9kZWNyeXB0aW9uX2Vycm'
+    '9yX21lc3NhZ2VCFgoUX3JldHJ5X2NvbnRyb2xfZXJyb3I=');

@$core.Deprecated('Use encryptedContentDescriptor instead')
 const EncryptedContent$json = {
  '1': 'EncryptedContent',
  '2': [
    {
-      '1': 'groupId',
+      '1': 'group_id',
      '3': 2,
      '4': 1,
      '5': 9,
@ -159,7 +159,7 @@ const EncryptedContent$json = {
      '17': true
    },
    {
-      '1': 'isDirectChat',
+      '1': 'is_direct_chat',
      '3': 3,
      '4': 1,
      '5': 8,
@ -168,7 +168,7 @@ const EncryptedContent$json = {
      '17': true
    },
    {
-      '1': 'senderProfileCounter',
+      '1': 'sender_profile_counter',
      '3': 4,
      '4': 1,
      '5': 3,
@ -177,12 +177,21 @@ const EncryptedContent$json = {
      '17': true
    },
    {
-      '1': 'messageUpdate',
+      '1': 'sender_user_discovery_version',
+      '3': 21,
+      '4': 1,
+      '5': 12,
+      '9': 3,
+      '10': 'senderUserDiscoveryVersion',
+      '17': true
+    },
+    {
+      '1': 'message_update',
      '3': 5,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.MessageUpdate',
-      '9': 3,
+      '9': 4,
      '10': 'messageUpdate',
      '17': true
    },
@ -192,57 +201,57 @@ const EncryptedContent$json = {
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.Media',
-      '9': 4,
+      '9': 5,
      '10': 'media',
      '17': true
    },
    {
-      '1': 'mediaUpdate',
+      '1': 'media_update',
      '3': 7,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.MediaUpdate',
-      '9': 5,
+      '9': 6,
      '10': 'mediaUpdate',
      '17': true
    },
    {
-      '1': 'contactUpdate',
+      '1': 'contact_update',
      '3': 8,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.ContactUpdate',
-      '9': 6,
+      '9': 7,
      '10': 'contactUpdate',
      '17': true
    },
    {
-      '1': 'contactRequest',
+      '1': 'contact_request',
      '3': 9,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.ContactRequest',
-      '9': 7,
+      '9': 8,
      '10': 'contactRequest',
      '17': true
    },
    {
-      '1': 'flameSync',
+      '1': 'flame_sync',
      '3': 10,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.FlameSync',
-      '9': 8,
+      '9': 9,
      '10': 'flameSync',
      '17': true
    },
    {
-      '1': 'pushKeys',
+      '1': 'push_keys',
      '3': 11,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.PushKeys',
-      '9': 9,
+      '9': 10,
      '10': 'pushKeys',
      '17': true
    },
@ -252,57 +261,57 @@ const EncryptedContent$json = {
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.Reaction',
-      '9': 10,
+      '9': 11,
      '10': 'reaction',
      '17': true
    },
    {
-      '1': 'textMessage',
+      '1': 'text_message',
      '3': 13,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.TextMessage',
-      '9': 11,
+      '9': 12,
      '10': 'textMessage',
      '17': true
    },
    {
-      '1': 'groupCreate',
+      '1': 'group_create',
      '3': 14,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.GroupCreate',
-      '9': 12,
+      '9': 13,
      '10': 'groupCreate',
      '17': true
    },
    {
-      '1': 'groupJoin',
+      '1': 'group_join',
      '3': 15,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.GroupJoin',
-      '9': 13,
+      '9': 14,
      '10': 'groupJoin',
      '17': true
    },
    {
-      '1': 'groupUpdate',
+      '1': 'group_update',
      '3': 16,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.GroupUpdate',
-      '9': 14,
+      '9': 15,
      '10': 'groupUpdate',
      '17': true
    },
    {
-      '1': 'resendGroupPublicKey',
+      '1': 'resend_group_public_key',
      '3': 17,
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.ResendGroupPublicKey',
-      '9': 15,
+      '9': 16,
      '10': 'resendGroupPublicKey',
      '17': true
    },
@ -312,7 +321,7 @@ const EncryptedContent$json = {
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.ErrorMessages',
-      '9': 16,
+      '9': 17,
      '10': 'errorMessages',
      '17': true
    },
@ -322,7 +331,7 @@ const EncryptedContent$json = {
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.AdditionalDataMessage',
-      '9': 17,
+      '9': 18,
      '10': 'additionalDataMessage',
      '17': true
    },
@ -332,10 +341,30 @@ const EncryptedContent$json = {
      '4': 1,
      '5': 11,
      '6': '.EncryptedContent.TypingIndicator',
-      '9': 18,
+      '9': 19,
      '10': 'typingIndicator',
      '17': true
    },
+    {
+      '1': 'user_discovery_request',
+      '3': 22,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.UserDiscoveryRequest',
+      '9': 20,
+      '10': 'userDiscoveryRequest',
+      '17': true
+    },
+    {
+      '1': 'user_discovery_update',
+      '3': 23,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.UserDiscoveryUpdate',
+      '9': 21,
+      '10': 'userDiscoveryUpdate',
+      '17': true
+    },
  ],
  '3': [
    EncryptedContent_ErrorMessages$json,
@ -353,28 +382,33 @@ const EncryptedContent$json = {
    EncryptedContent_ContactUpdate$json,
    EncryptedContent_PushKeys$json,
    EncryptedContent_FlameSync$json,
-    EncryptedContent_TypingIndicator$json
+    EncryptedContent_TypingIndicator$json,
+    EncryptedContent_UserDiscoveryRequest$json,
+    EncryptedContent_UserDiscoveryUpdate$json
  ],
  '8': [
-    {'1': '_groupId'},
-    {'1': '_isDirectChat'},
-    {'1': '_senderProfileCounter'},
-    {'1': '_messageUpdate'},
+    {'1': '_group_id'},
+    {'1': '_is_direct_chat'},
+    {'1': '_sender_profile_counter'},
+    {'1': '_sender_user_discovery_version'},
+    {'1': '_message_update'},
    {'1': '_media'},
-    {'1': '_mediaUpdate'},
-    {'1': '_contactUpdate'},
-    {'1': '_contactRequest'},
-    {'1': '_flameSync'},
-    {'1': '_pushKeys'},
+    {'1': '_media_update'},
+    {'1': '_contact_update'},
+    {'1': '_contact_request'},
+    {'1': '_flame_sync'},
+    {'1': '_push_keys'},
    {'1': '_reaction'},
-    {'1': '_textMessage'},
-    {'1': '_groupCreate'},
-    {'1': '_groupJoin'},
-    {'1': '_groupUpdate'},
-    {'1': '_resendGroupPublicKey'},
+    {'1': '_text_message'},
+    {'1': '_group_create'},
+    {'1': '_group_join'},
+    {'1': '_group_update'},
+    {'1': '_resend_group_public_key'},
    {'1': '_error_messages'},
    {'1': '_additional_data_message'},
    {'1': '_typing_indicator'},
+    {'1': '_user_discovery_request'},
+    {'1': '_user_discovery_update'},
  ],
 };

@ -415,8 +449,8 @@ const EncryptedContent_ErrorMessages_Type$json = {
 const EncryptedContent_GroupCreate$json = {
  '1': 'GroupCreate',
  '2': [
-    {'1': 'stateKey', '3': 3, '4': 1, '5': 12, '10': 'stateKey'},
-    {'1': 'groupPublicKey', '3': 4, '4': 1, '5': 12, '10': 'groupPublicKey'},
+    {'1': 'state_key', '3': 3, '4': 1, '5': 12, '10': 'stateKey'},
+    {'1': 'group_public_key', '3': 4, '4': 1, '5': 12, '10': 'groupPublicKey'},
  ],
 };

@ -424,7 +458,7 @@ const EncryptedContent_GroupCreate$json = {
 const EncryptedContent_GroupJoin$json = {
  '1': 'GroupJoin',
  '2': [
-    {'1': 'groupPublicKey', '3': 1, '4': 1, '5': 12, '10': 'groupPublicKey'},
+    {'1': 'group_public_key', '3': 1, '4': 1, '5': 12, '10': 'groupPublicKey'},
  ],
 };

@ -437,9 +471,9 @@ const EncryptedContent_ResendGroupPublicKey$json = {
 const EncryptedContent_GroupUpdate$json = {
  '1': 'GroupUpdate',
  '2': [
-    {'1': 'groupActionType', '3': 1, '4': 1, '5': 9, '10': 'groupActionType'},
+    {'1': 'group_action_type', '3': 1, '4': 1, '5': 9, '10': 'groupActionType'},
    {
-      '1': 'affectedContactId',
+      '1': 'affected_contact_id',
      '3': 2,
      '4': 1,
      '5': 3,
@ -448,7 +482,7 @@ const EncryptedContent_GroupUpdate$json = {
      '17': true
    },
    {
-      '1': 'newGroupName',
+      '1': 'new_group_name',
      '3': 3,
      '4': 1,
      '5': 9,
@ -457,7 +491,7 @@ const EncryptedContent_GroupUpdate$json = {
      '17': true
    },
    {
-      '1': 'newDeleteMessagesAfterMilliseconds',
+      '1': 'new_delete_messages_after_milliseconds',
      '3': 4,
      '4': 1,
      '5': 3,
@ -467,9 +501,9 @@ const EncryptedContent_GroupUpdate$json = {
    },
  ],
  '8': [
-    {'1': '_affectedContactId'},
-    {'1': '_newGroupName'},
-    {'1': '_newDeleteMessagesAfterMilliseconds'},
+    {'1': '_affected_contact_id'},
+    {'1': '_new_group_name'},
+    {'1': '_new_delete_messages_after_milliseconds'},
  ],
 };

@ -477,11 +511,11 @@ const EncryptedContent_GroupUpdate$json = {
 const EncryptedContent_TextMessage$json = {
  '1': 'TextMessage',
  '2': [
-    {'1': 'senderMessageId', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
+    {'1': 'sender_message_id', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
    {'1': 'text', '3': 2, '4': 1, '5': 9, '10': 'text'},
    {'1': 'timestamp', '3': 3, '4': 1, '5': 3, '10': 'timestamp'},
    {
-      '1': 'quoteMessageId',
+      '1': 'quote_message_id',
      '3': 4,
      '4': 1,
      '5': 9,
@ -491,7 +525,7 @@ const EncryptedContent_TextMessage$json = {
    },
  ],
  '8': [
-    {'1': '_quoteMessageId'},
+    {'1': '_quote_message_id'},
  ],
 };

@ -521,7 +555,7 @@ const EncryptedContent_AdditionalDataMessage$json = {
 const EncryptedContent_Reaction$json = {
  '1': 'Reaction',
  '2': [
-    {'1': 'targetMessageId', '3': 1, '4': 1, '5': 9, '10': 'targetMessageId'},
+    {'1': 'target_message_id', '3': 1, '4': 1, '5': 9, '10': 'targetMessageId'},
    {'1': 'emoji', '3': 2, '4': 1, '5': 9, '10': 'emoji'},
    {'1': 'remove', '3': 3, '4': 1, '5': 8, '10': 'remove'},
  ],
@ -540,7 +574,7 @@ const EncryptedContent_MessageUpdate$json = {
      '10': 'type'
    },
    {
-      '1': 'senderMessageId',
+      '1': 'sender_message_id',
      '3': 2,
      '4': 1,
      '5': 9,
@ -549,7 +583,7 @@ const EncryptedContent_MessageUpdate$json = {
      '17': true
    },
    {
-      '1': 'multipleTargetMessageIds',
+      '1': 'multiple_target_message_ids',
      '3': 3,
      '4': 3,
      '5': 9,
@ -560,7 +594,7 @@ const EncryptedContent_MessageUpdate$json = {
  ],
  '4': [EncryptedContent_MessageUpdate_Type$json],
  '8': [
-    {'1': '_senderMessageId'},
+    {'1': '_sender_message_id'},
    {'1': '_text'},
  ],
 };
@ -579,7 +613,7 @@ const EncryptedContent_MessageUpdate_Type$json = {
 const EncryptedContent_Media$json = {
  '1': 'Media',
  '2': [
-    {'1': 'senderMessageId', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
+    {'1': 'sender_message_id', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
    {
      '1': 'type',
      '3': 2,
@ -589,7 +623,7 @@ const EncryptedContent_Media$json = {
      '10': 'type'
    },
    {
-      '1': 'displayLimitInMilliseconds',
+      '1': 'display_limit_in_milliseconds',
      '3': 3,
      '4': 1,
      '5': 3,
@ -598,7 +632,7 @@ const EncryptedContent_Media$json = {
      '17': true
    },
    {
-      '1': 'requiresAuthentication',
+      '1': 'requires_authentication',
      '3': 4,
      '4': 1,
      '5': 8,
@ -606,7 +640,7 @@ const EncryptedContent_Media$json = {
    },
    {'1': 'timestamp', '3': 5, '4': 1, '5': 3, '10': 'timestamp'},
    {
-      '1': 'quoteMessageId',
+      '1': 'quote_message_id',
      '3': 6,
      '4': 1,
      '5': 9,
@ -615,7 +649,7 @@ const EncryptedContent_Media$json = {
      '17': true
    },
    {
-      '1': 'downloadToken',
+      '1': 'download_token',
      '3': 7,
      '4': 1,
      '5': 12,
@ -624,7 +658,7 @@ const EncryptedContent_Media$json = {
      '17': true
    },
    {
-      '1': 'encryptionKey',
+      '1': 'encryption_key',
      '3': 8,
      '4': 1,
      '5': 12,
@ -633,7 +667,7 @@ const EncryptedContent_Media$json = {
      '17': true
    },
    {
-      '1': 'encryptionMac',
+      '1': 'encryption_mac',
      '3': 9,
      '4': 1,
      '5': 12,
@ -642,7 +676,7 @@ const EncryptedContent_Media$json = {
      '17': true
    },
    {
-      '1': 'encryptionNonce',
+      '1': 'encryption_nonce',
      '3': 10,
      '4': 1,
      '5': 12,
@ -662,12 +696,12 @@ const EncryptedContent_Media$json = {
  ],
  '4': [EncryptedContent_Media_Type$json],
  '8': [
-    {'1': '_displayLimitInMilliseconds'},
-    {'1': '_quoteMessageId'},
-    {'1': '_downloadToken'},
-    {'1': '_encryptionKey'},
-    {'1': '_encryptionMac'},
-    {'1': '_encryptionNonce'},
+    {'1': '_display_limit_in_milliseconds'},
+    {'1': '_quote_message_id'},
+    {'1': '_download_token'},
+    {'1': '_encryption_key'},
+    {'1': '_encryption_mac'},
+    {'1': '_encryption_nonce'},
    {'1': '_additional_message_data'},
  ],
 };
@ -696,7 +730,7 @@ const EncryptedContent_MediaUpdate$json = {
      '6': '.EncryptedContent.MediaUpdate.Type',
      '10': 'type'
    },
-    {'1': 'targetMessageId', '3': 2, '4': 1, '5': 9, '10': 'targetMessageId'},
+    {'1': 'target_message_id', '3': 2, '4': 1, '5': 9, '10': 'targetMessageId'},
  ],
  '4': [EncryptedContent_MediaUpdate_Type$json],
 };
@ -750,7 +784,7 @@ const EncryptedContent_ContactUpdate$json = {
      '10': 'type'
    },
    {
-      '1': 'avatarSvgCompressed',
+      '1': 'avatar_svg_compressed',
      '3': 2,
      '4': 1,
      '5': 12,
@ -768,7 +802,7 @@ const EncryptedContent_ContactUpdate$json = {
      '17': true
    },
    {
-      '1': 'displayName',
+      '1': 'display_name',
      '3': 4,
      '4': 1,
      '5': 9,
@ -779,9 +813,9 @@ const EncryptedContent_ContactUpdate$json = {
  ],
  '4': [EncryptedContent_ContactUpdate_Type$json],
  '8': [
-    {'1': '_avatarSvgCompressed'},
+    {'1': '_avatar_svg_compressed'},
    {'1': '_username'},
-    {'1': '_displayName'},
+    {'1': '_display_name'},
  ],
 };

@ -806,10 +840,10 @@ const EncryptedContent_PushKeys$json = {
      '6': '.EncryptedContent.PushKeys.Type',
      '10': 'type'
    },
-    {'1': 'keyId', '3': 2, '4': 1, '5': 3, '9': 0, '10': 'keyId', '17': true},
+    {'1': 'key_id', '3': 2, '4': 1, '5': 3, '9': 0, '10': 'keyId', '17': true},
    {'1': 'key', '3': 3, '4': 1, '5': 12, '9': 1, '10': 'key', '17': true},
    {
-      '1': 'createdAt',
+      '1': 'created_at',
      '3': 4,
      '4': 1,
      '5': 3,
@ -820,9 +854,9 @@ const EncryptedContent_PushKeys$json = {
  ],
  '4': [EncryptedContent_PushKeys_Type$json],
  '8': [
-    {'1': '_keyId'},
+    {'1': '_key_id'},
    {'1': '_key'},
-    {'1': '_createdAt'},
+    {'1': '_created_at'},
  ],
 };

@ -839,16 +873,16 @@ const EncryptedContent_PushKeys_Type$json = {
 const EncryptedContent_FlameSync$json = {
  '1': 'FlameSync',
  '2': [
-    {'1': 'flameCounter', '3': 1, '4': 1, '5': 3, '10': 'flameCounter'},
+    {'1': 'flame_counter', '3': 1, '4': 1, '5': 3, '10': 'flameCounter'},
    {
-      '1': 'lastFlameCounterChange',
+      '1': 'last_flame_counter_change',
      '3': 2,
      '4': 1,
      '5': 3,
      '10': 'lastFlameCounterChange'
    },
-    {'1': 'bestFriend', '3': 3, '4': 1, '5': 8, '10': 'bestFriend'},
-    {'1': 'forceUpdate', '3': 4, '4': 1, '5': 8, '10': 'forceUpdate'},
+    {'1': 'best_friend', '3': 3, '4': 1, '5': 8, '10': 'bestFriend'},
+    {'1': 'force_update', '3': 4, '4': 1, '5': 8, '10': 'forceUpdate'},
  ],
 };

@ -861,95 +895,121 @@ const EncryptedContent_TypingIndicator$json = {
  ],
 };

+@$core.Deprecated('Use encryptedContentDescriptor instead')
+const EncryptedContent_UserDiscoveryRequest$json = {
+  '1': 'UserDiscoveryRequest',
+  '2': [
+    {'1': 'current_version', '3': 1, '4': 1, '5': 12, '10': 'currentVersion'},
+  ],
+};
+
+@$core.Deprecated('Use encryptedContentDescriptor instead')
+const EncryptedContent_UserDiscoveryUpdate$json = {
+  '1': 'UserDiscoveryUpdate',
+  '2': [
+    {'1': 'messages', '3': 1, '4': 3, '5': 12, '10': 'messages'},
+  ],
+};
+
 /// Descriptor for `EncryptedContent`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedContentDescriptor = $convert.base64Decode(
-    'ChBFbmNyeXB0ZWRDb250ZW50Eh0KB2dyb3VwSWQYAiABKAlIAFIHZ3JvdXBJZIgBARInCgxpc0'
-    'RpcmVjdENoYXQYAyABKAhIAVIMaXNEaXJlY3RDaGF0iAEBEjcKFHNlbmRlclByb2ZpbGVDb3Vu'
-    'dGVyGAQgASgDSAJSFHNlbmRlclByb2ZpbGVDb3VudGVyiAEBEkoKDW1lc3NhZ2VVcGRhdGUYBS'
-    'ABKAsyHy5FbmNyeXB0ZWRDb250ZW50Lk1lc3NhZ2VVcGRhdGVIA1INbWVzc2FnZVVwZGF0ZYgB'
-    'ARIyCgVtZWRpYRgGIAEoCzIXLkVuY3J5cHRlZENvbnRlbnQuTWVkaWFIBFIFbWVkaWGIAQESRA'
-    'oLbWVkaWFVcGRhdGUYByABKAsyHS5FbmNyeXB0ZWRDb250ZW50Lk1lZGlhVXBkYXRlSAVSC21l'
-    'ZGlhVXBkYXRliAEBEkoKDWNvbnRhY3RVcGRhdGUYCCABKAsyHy5FbmNyeXB0ZWRDb250ZW50Lk'
-    'NvbnRhY3RVcGRhdGVIBlINY29udGFjdFVwZGF0ZYgBARJNCg5jb250YWN0UmVxdWVzdBgJIAEo'
-    'CzIgLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFJlcXVlc3RIB1IOY29udGFjdFJlcXVlc3SIAQ'
-    'ESPgoJZmxhbWVTeW5jGAogASgLMhsuRW5jcnlwdGVkQ29udGVudC5GbGFtZVN5bmNICFIJZmxh'
-    'bWVTeW5jiAEBEjsKCHB1c2hLZXlzGAsgASgLMhouRW5jcnlwdGVkQ29udGVudC5QdXNoS2V5c0'
-    'gJUghwdXNoS2V5c4gBARI7CghyZWFjdGlvbhgMIAEoCzIaLkVuY3J5cHRlZENvbnRlbnQuUmVh'
-    'Y3Rpb25IClIIcmVhY3Rpb26IAQESRAoLdGV4dE1lc3NhZ2UYDSABKAsyHS5FbmNyeXB0ZWRDb2'
-    '50ZW50LlRleHRNZXNzYWdlSAtSC3RleHRNZXNzYWdliAEBEkQKC2dyb3VwQ3JlYXRlGA4gASgL'
-    'Mh0uRW5jcnlwdGVkQ29udGVudC5Hcm91cENyZWF0ZUgMUgtncm91cENyZWF0ZYgBARI+Cglncm'
-    '91cEpvaW4YDyABKAsyGy5FbmNyeXB0ZWRDb250ZW50Lkdyb3VwSm9pbkgNUglncm91cEpvaW6I'
-    'AQESRAoLZ3JvdXBVcGRhdGUYECABKAsyHS5FbmNyeXB0ZWRDb250ZW50Lkdyb3VwVXBkYXRlSA'
-    '5SC2dyb3VwVXBkYXRliAEBEl8KFHJlc2VuZEdyb3VwUHVibGljS2V5GBEgASgLMiYuRW5jcnlw'
-    'dGVkQ29udGVudC5SZXNlbmRHcm91cFB1YmxpY0tleUgPUhRyZXNlbmRHcm91cFB1YmxpY0tleY'
-    'gBARJLCg5lcnJvcl9tZXNzYWdlcxgSIAEoCzIfLkVuY3J5cHRlZENvbnRlbnQuRXJyb3JNZXNz'
-    'YWdlc0gQUg1lcnJvck1lc3NhZ2VziAEBEmQKF2FkZGl0aW9uYWxfZGF0YV9tZXNzYWdlGBMgAS'
-    'gLMicuRW5jcnlwdGVkQ29udGVudC5BZGRpdGlvbmFsRGF0YU1lc3NhZ2VIEVIVYWRkaXRpb25h'
-    'bERhdGFNZXNzYWdliAEBElEKEHR5cGluZ19pbmRpY2F0b3IYFCABKAsyIS5FbmNyeXB0ZWRDb2'
-    '50ZW50LlR5cGluZ0luZGljYXRvckgSUg90eXBpbmdJbmRpY2F0b3KIAQEa8AEKDUVycm9yTWVz'
-    'c2FnZXMSOAoEdHlwZRgBIAEoDjIkLkVuY3J5cHRlZENvbnRlbnQuRXJyb3JNZXNzYWdlcy5UeX'
-    'BlUgR0eXBlEiwKEnJlbGF0ZWRfcmVjZWlwdF9pZBgCIAEoCVIQcmVsYXRlZFJlY2VpcHRJZCJ3'
-    'CgRUeXBlEjwKOEVSUk9SX1BST0NFU1NJTkdfTUVTU0FHRV9DUkVBVEVEX0FDQ09VTlRfUkVRVU'
-    'VTVF9JTlNURUFEEAASGAoUVU5LTk9XTl9NRVNTQUdFX1RZUEUQAhIXChNTRVNTSU9OX09VVF9P'
-    'Rl9TWU5DEAMaUQoLR3JvdXBDcmVhdGUSGgoIc3RhdGVLZXkYAyABKAxSCHN0YXRlS2V5EiYKDm'
-    'dyb3VwUHVibGljS2V5GAQgASgMUg5ncm91cFB1YmxpY0tleRozCglHcm91cEpvaW4SJgoOZ3Jv'
-    'dXBQdWJsaWNLZXkYASABKAxSDmdyb3VwUHVibGljS2V5GhYKFFJlc2VuZEdyb3VwUHVibGljS2'
-    'V5GrYCCgtHcm91cFVwZGF0ZRIoCg9ncm91cEFjdGlvblR5cGUYASABKAlSD2dyb3VwQWN0aW9u'
-    'VHlwZRIxChFhZmZlY3RlZENvbnRhY3RJZBgCIAEoA0gAUhFhZmZlY3RlZENvbnRhY3RJZIgBAR'
-    'InCgxuZXdHcm91cE5hbWUYAyABKAlIAVIMbmV3R3JvdXBOYW1liAEBElMKIm5ld0RlbGV0ZU1l'
-    'c3NhZ2VzQWZ0ZXJNaWxsaXNlY29uZHMYBCABKANIAlIibmV3RGVsZXRlTWVzc2FnZXNBZnRlck'
-    '1pbGxpc2Vjb25kc4gBAUIUChJfYWZmZWN0ZWRDb250YWN0SWRCDwoNX25ld0dyb3VwTmFtZUIl'
-    'CiNfbmV3RGVsZXRlTWVzc2FnZXNBZnRlck1pbGxpc2Vjb25kcxqpAQoLVGV4dE1lc3NhZ2USKA'
-    'oPc2VuZGVyTWVzc2FnZUlkGAEgASgJUg9zZW5kZXJNZXNzYWdlSWQSEgoEdGV4dBgCIAEoCVIE'
-    'dGV4dBIcCgl0aW1lc3RhbXAYAyABKANSCXRpbWVzdGFtcBIrCg5xdW90ZU1lc3NhZ2VJZBgEIA'
-    'EoCUgAUg5xdW90ZU1lc3NhZ2VJZIgBAUIRCg9fcXVvdGVNZXNzYWdlSWQazgEKFUFkZGl0aW9u'
-    'YWxEYXRhTWVzc2FnZRIqChFzZW5kZXJfbWVzc2FnZV9pZBgBIAEoCVIPc2VuZGVyTWVzc2FnZU'
-    'lkEhwKCXRpbWVzdGFtcBgCIAEoA1IJdGltZXN0YW1wEhIKBHR5cGUYAyABKAlSBHR5cGUSOwoX'
-    'YWRkaXRpb25hbF9tZXNzYWdlX2RhdGEYBCABKAxIAFIVYWRkaXRpb25hbE1lc3NhZ2VEYXRhiA'
-    'EBQhoKGF9hZGRpdGlvbmFsX21lc3NhZ2VfZGF0YRpiCghSZWFjdGlvbhIoCg90YXJnZXRNZXNz'
-    'YWdlSWQYASABKAlSD3RhcmdldE1lc3NhZ2VJZBIUCgVlbW9qaRgCIAEoCVIFZW1vamkSFgoGcm'
-    'Vtb3ZlGAMgASgIUgZyZW1vdmUatwIKDU1lc3NhZ2VVcGRhdGUSOAoEdHlwZRgBIAEoDjIkLkVu'
-    'Y3J5cHRlZENvbnRlbnQuTWVzc2FnZVVwZGF0ZS5UeXBlUgR0eXBlEi0KD3NlbmRlck1lc3NhZ2'
-    'VJZBgCIAEoCUgAUg9zZW5kZXJNZXNzYWdlSWSIAQESOgoYbXVsdGlwbGVUYXJnZXRNZXNzYWdl'
-    'SWRzGAMgAygJUhhtdWx0aXBsZVRhcmdldE1lc3NhZ2VJZHMSFwoEdGV4dBgEIAEoCUgBUgR0ZX'
-    'h0iAEBEhwKCXRpbWVzdGFtcBgFIAEoA1IJdGltZXN0YW1wIi0KBFR5cGUSCgoGREVMRVRFEAAS'
-    'DQoJRURJVF9URVhUEAESCgoGT1BFTkVEEAJCEgoQX3NlbmRlck1lc3NhZ2VJZEIHCgVfdGV4dB'
-    'rwBQoFTWVkaWESKAoPc2VuZGVyTWVzc2FnZUlkGAEgASgJUg9zZW5kZXJNZXNzYWdlSWQSMAoE'
-    'dHlwZRgCIAEoDjIcLkVuY3J5cHRlZENvbnRlbnQuTWVkaWEuVHlwZVIEdHlwZRJDChpkaXNwbG'
-    'F5TGltaXRJbk1pbGxpc2Vjb25kcxgDIAEoA0gAUhpkaXNwbGF5TGltaXRJbk1pbGxpc2Vjb25k'
-    'c4gBARI2ChZyZXF1aXJlc0F1dGhlbnRpY2F0aW9uGAQgASgIUhZyZXF1aXJlc0F1dGhlbnRpY2'
-    'F0aW9uEhwKCXRpbWVzdGFtcBgFIAEoA1IJdGltZXN0YW1wEisKDnF1b3RlTWVzc2FnZUlkGAYg'
-    'ASgJSAFSDnF1b3RlTWVzc2FnZUlkiAEBEikKDWRvd25sb2FkVG9rZW4YByABKAxIAlINZG93bm'
-    'xvYWRUb2tlbogBARIpCg1lbmNyeXB0aW9uS2V5GAggASgMSANSDWVuY3J5cHRpb25LZXmIAQES'
-    'KQoNZW5jcnlwdGlvbk1hYxgJIAEoDEgEUg1lbmNyeXB0aW9uTWFjiAEBEi0KD2VuY3J5cHRpb2'
-    '5Ob25jZRgKIAEoDEgFUg9lbmNyeXB0aW9uTm9uY2WIAQESOwoXYWRkaXRpb25hbF9tZXNzYWdl'
-    'X2RhdGEYCyABKAxIBlIVYWRkaXRpb25hbE1lc3NhZ2VEYXRhiAEBIj4KBFR5cGUSDAoIUkVVUE'
-    'xPQUQQABIJCgVJTUFHRRABEgkKBVZJREVPEAISBwoDR0lGEAMSCQoFQVVESU8QBEIdChtfZGlz'
-    'cGxheUxpbWl0SW5NaWxsaXNlY29uZHNCEQoPX3F1b3RlTWVzc2FnZUlkQhAKDl9kb3dubG9hZF'
-    'Rva2VuQhAKDl9lbmNyeXB0aW9uS2V5QhAKDl9lbmNyeXB0aW9uTWFjQhIKEF9lbmNyeXB0aW9u'
-    'Tm9uY2VCGgoYX2FkZGl0aW9uYWxfbWVzc2FnZV9kYXRhGqcBCgtNZWRpYVVwZGF0ZRI2CgR0eX'
-    'BlGAEgASgOMiIuRW5jcnlwdGVkQ29udGVudC5NZWRpYVVwZGF0ZS5UeXBlUgR0eXBlEigKD3Rh'
-    'cmdldE1lc3NhZ2VJZBgCIAEoCVIPdGFyZ2V0TWVzc2FnZUlkIjYKBFR5cGUSDAoIUkVPUEVORU'
-    'QQABIKCgZTVE9SRUQQARIUChBERUNSWVBUSU9OX0VSUk9SEAIaeAoOQ29udGFjdFJlcXVlc3QS'
-    'OQoEdHlwZRgBIAEoDjIlLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFJlcXVlc3QuVHlwZVIEdH'
-    'lwZSIrCgRUeXBlEgsKB1JFUVVFU1QQABIKCgZSRUpFQ1QQARIKCgZBQ0NFUFQQAhqeAgoNQ29u'
-    'dGFjdFVwZGF0ZRI4CgR0eXBlGAEgASgOMiQuRW5jcnlwdGVkQ29udGVudC5Db250YWN0VXBkYX'
-    'RlLlR5cGVSBHR5cGUSNQoTYXZhdGFyU3ZnQ29tcHJlc3NlZBgCIAEoDEgAUhNhdmF0YXJTdmdD'
-    'b21wcmVzc2VkiAEBEh8KCHVzZXJuYW1lGAMgASgJSAFSCHVzZXJuYW1liAEBEiUKC2Rpc3BsYX'
-    'lOYW1lGAQgASgJSAJSC2Rpc3BsYXlOYW1liAEBIh8KBFR5cGUSCwoHUkVRVUVTVBAAEgoKBlVQ'
-    'REFURRABQhYKFF9hdmF0YXJTdmdDb21wcmVzc2VkQgsKCV91c2VybmFtZUIOCgxfZGlzcGxheU'
-    '5hbWUa1QEKCFB1c2hLZXlzEjMKBHR5cGUYASABKA4yHy5FbmNyeXB0ZWRDb250ZW50LlB1c2hL'
-    'ZXlzLlR5cGVSBHR5cGUSGQoFa2V5SWQYAiABKANIAFIFa2V5SWSIAQESFQoDa2V5GAMgASgMSA'
-    'FSA2tleYgBARIhCgljcmVhdGVkQXQYBCABKANIAlIJY3JlYXRlZEF0iAEBIh8KBFR5cGUSCwoH'
-    'UkVRVUVTVBAAEgoKBlVQREFURRABQggKBl9rZXlJZEIGCgRfa2V5QgwKCl9jcmVhdGVkQXQaqQ'
-    'EKCUZsYW1lU3luYxIiCgxmbGFtZUNvdW50ZXIYASABKANSDGZsYW1lQ291bnRlchI2ChZsYXN0'
-    'RmxhbWVDb3VudGVyQ2hhbmdlGAIgASgDUhZsYXN0RmxhbWVDb3VudGVyQ2hhbmdlEh4KCmJlc3'
-    'RGcmllbmQYAyABKAhSCmJlc3RGcmllbmQSIAoLZm9yY2VVcGRhdGUYBCABKAhSC2ZvcmNlVXBk'
-    'YXRlGk0KD1R5cGluZ0luZGljYXRvchIbCglpc190eXBpbmcYASABKAhSCGlzVHlwaW5nEh0KCm'
-    'NyZWF0ZWRfYXQYAiABKANSCWNyZWF0ZWRBdEIKCghfZ3JvdXBJZEIPCg1faXNEaXJlY3RDaGF0'
-    'QhcKFV9zZW5kZXJQcm9maWxlQ291bnRlckIQCg5fbWVzc2FnZVVwZGF0ZUIICgZfbWVkaWFCDg'
-    'oMX21lZGlhVXBkYXRlQhAKDl9jb250YWN0VXBkYXRlQhEKD19jb250YWN0UmVxdWVzdEIMCgpf'
-    'ZmxhbWVTeW5jQgsKCV9wdXNoS2V5c0ILCglfcmVhY3Rpb25CDgoMX3RleHRNZXNzYWdlQg4KDF'
-    '9ncm91cENyZWF0ZUIMCgpfZ3JvdXBKb2luQg4KDF9ncm91cFVwZGF0ZUIXChVfcmVzZW5kR3Jv'
-    'dXBQdWJsaWNLZXlCEQoPX2Vycm9yX21lc3NhZ2VzQhoKGF9hZGRpdGlvbmFsX2RhdGFfbWVzc2'
-    'FnZUITChFfdHlwaW5nX2luZGljYXRvcg==');
+    'ChBFbmNyeXB0ZWRDb250ZW50Eh4KCGdyb3VwX2lkGAIgASgJSABSB2dyb3VwSWSIAQESKQoOaX'
+    'NfZGlyZWN0X2NoYXQYAyABKAhIAVIMaXNEaXJlY3RDaGF0iAEBEjkKFnNlbmRlcl9wcm9maWxl'
+    'X2NvdW50ZXIYBCABKANIAlIUc2VuZGVyUHJvZmlsZUNvdW50ZXKIAQESRgodc2VuZGVyX3VzZX'
+    'JfZGlzY292ZXJ5X3ZlcnNpb24YFSABKAxIA1Iac2VuZGVyVXNlckRpc2NvdmVyeVZlcnNpb26I'
+    'AQESSwoObWVzc2FnZV91cGRhdGUYBSABKAsyHy5FbmNyeXB0ZWRDb250ZW50Lk1lc3NhZ2VVcG'
+    'RhdGVIBFINbWVzc2FnZVVwZGF0ZYgBARIyCgVtZWRpYRgGIAEoCzIXLkVuY3J5cHRlZENvbnRl'
+    'bnQuTWVkaWFIBVIFbWVkaWGIAQESRQoMbWVkaWFfdXBkYXRlGAcgASgLMh0uRW5jcnlwdGVkQ2'
+    '9udGVudC5NZWRpYVVwZGF0ZUgGUgttZWRpYVVwZGF0ZYgBARJLCg5jb250YWN0X3VwZGF0ZRgI'
+    'IAEoCzIfLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFVwZGF0ZUgHUg1jb250YWN0VXBkYXRliA'
+    'EBEk4KD2NvbnRhY3RfcmVxdWVzdBgJIAEoCzIgLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFJl'
+    'cXVlc3RICFIOY29udGFjdFJlcXVlc3SIAQESPwoKZmxhbWVfc3luYxgKIAEoCzIbLkVuY3J5cH'
+    'RlZENvbnRlbnQuRmxhbWVTeW5jSAlSCWZsYW1lU3luY4gBARI8CglwdXNoX2tleXMYCyABKAsy'
+    'Gi5FbmNyeXB0ZWRDb250ZW50LlB1c2hLZXlzSApSCHB1c2hLZXlziAEBEjsKCHJlYWN0aW9uGA'
+    'wgASgLMhouRW5jcnlwdGVkQ29udGVudC5SZWFjdGlvbkgLUghyZWFjdGlvbogBARJFCgx0ZXh0'
+    'X21lc3NhZ2UYDSABKAsyHS5FbmNyeXB0ZWRDb250ZW50LlRleHRNZXNzYWdlSAxSC3RleHRNZX'
+    'NzYWdliAEBEkUKDGdyb3VwX2NyZWF0ZRgOIAEoCzIdLkVuY3J5cHRlZENvbnRlbnQuR3JvdXBD'
+    'cmVhdGVIDVILZ3JvdXBDcmVhdGWIAQESPwoKZ3JvdXBfam9pbhgPIAEoCzIbLkVuY3J5cHRlZE'
+    'NvbnRlbnQuR3JvdXBKb2luSA5SCWdyb3VwSm9pbogBARJFCgxncm91cF91cGRhdGUYECABKAsy'
+    'HS5FbmNyeXB0ZWRDb250ZW50Lkdyb3VwVXBkYXRlSA9SC2dyb3VwVXBkYXRliAEBEmIKF3Jlc2'
+    'VuZF9ncm91cF9wdWJsaWNfa2V5GBEgASgLMiYuRW5jcnlwdGVkQ29udGVudC5SZXNlbmRHcm91'
+    'cFB1YmxpY0tleUgQUhRyZXNlbmRHcm91cFB1YmxpY0tleYgBARJLCg5lcnJvcl9tZXNzYWdlcx'
+    'gSIAEoCzIfLkVuY3J5cHRlZENvbnRlbnQuRXJyb3JNZXNzYWdlc0gRUg1lcnJvck1lc3NhZ2Vz'
+    'iAEBEmQKF2FkZGl0aW9uYWxfZGF0YV9tZXNzYWdlGBMgASgLMicuRW5jcnlwdGVkQ29udGVudC'
+    '5BZGRpdGlvbmFsRGF0YU1lc3NhZ2VIElIVYWRkaXRpb25hbERhdGFNZXNzYWdliAEBElEKEHR5'
+    'cGluZ19pbmRpY2F0b3IYFCABKAsyIS5FbmNyeXB0ZWRDb250ZW50LlR5cGluZ0luZGljYXRvck'
+    'gTUg90eXBpbmdJbmRpY2F0b3KIAQESYQoWdXNlcl9kaXNjb3ZlcnlfcmVxdWVzdBgWIAEoCzIm'
+    'LkVuY3J5cHRlZENvbnRlbnQuVXNlckRpc2NvdmVyeVJlcXVlc3RIFFIUdXNlckRpc2NvdmVyeV'
+    'JlcXVlc3SIAQESXgoVdXNlcl9kaXNjb3ZlcnlfdXBkYXRlGBcgASgLMiUuRW5jcnlwdGVkQ29u'
+    'dGVudC5Vc2VyRGlzY292ZXJ5VXBkYXRlSBVSE3VzZXJEaXNjb3ZlcnlVcGRhdGWIAQEa8AEKDU'
+    'Vycm9yTWVzc2FnZXMSOAoEdHlwZRgBIAEoDjIkLkVuY3J5cHRlZENvbnRlbnQuRXJyb3JNZXNz'
+    'YWdlcy5UeXBlUgR0eXBlEiwKEnJlbGF0ZWRfcmVjZWlwdF9pZBgCIAEoCVIQcmVsYXRlZFJlY2'
+    'VpcHRJZCJ3CgRUeXBlEjwKOEVSUk9SX1BST0NFU1NJTkdfTUVTU0FHRV9DUkVBVEVEX0FDQ09V'
+    'TlRfUkVRVUVTVF9JTlNURUFEEAASGAoUVU5LTk9XTl9NRVNTQUdFX1RZUEUQAhIXChNTRVNTSU'
+    '9OX09VVF9PRl9TWU5DEAMaVAoLR3JvdXBDcmVhdGUSGwoJc3RhdGVfa2V5GAMgASgMUghzdGF0'
+    'ZUtleRIoChBncm91cF9wdWJsaWNfa2V5GAQgASgMUg5ncm91cFB1YmxpY0tleRo1CglHcm91cE'
+    'pvaW4SKAoQZ3JvdXBfcHVibGljX2tleRgBIAEoDFIOZ3JvdXBQdWJsaWNLZXkaFgoUUmVzZW5k'
+    'R3JvdXBQdWJsaWNLZXkayAIKC0dyb3VwVXBkYXRlEioKEWdyb3VwX2FjdGlvbl90eXBlGAEgAS'
+    'gJUg9ncm91cEFjdGlvblR5cGUSMwoTYWZmZWN0ZWRfY29udGFjdF9pZBgCIAEoA0gAUhFhZmZl'
+    'Y3RlZENvbnRhY3RJZIgBARIpCg5uZXdfZ3JvdXBfbmFtZRgDIAEoCUgBUgxuZXdHcm91cE5hbW'
+    'WIAQESVwombmV3X2RlbGV0ZV9tZXNzYWdlc19hZnRlcl9taWxsaXNlY29uZHMYBCABKANIAlIi'
+    'bmV3RGVsZXRlTWVzc2FnZXNBZnRlck1pbGxpc2Vjb25kc4gBAUIWChRfYWZmZWN0ZWRfY29udG'
+    'FjdF9pZEIRCg9fbmV3X2dyb3VwX25hbWVCKQonX25ld19kZWxldGVfbWVzc2FnZXNfYWZ0ZXJf'
+    'bWlsbGlzZWNvbmRzGq8BCgtUZXh0TWVzc2FnZRIqChFzZW5kZXJfbWVzc2FnZV9pZBgBIAEoCV'
+    'IPc2VuZGVyTWVzc2FnZUlkEhIKBHRleHQYAiABKAlSBHRleHQSHAoJdGltZXN0YW1wGAMgASgD'
+    'Ugl0aW1lc3RhbXASLQoQcXVvdGVfbWVzc2FnZV9pZBgEIAEoCUgAUg5xdW90ZU1lc3NhZ2VJZI'
+    'gBAUITChFfcXVvdGVfbWVzc2FnZV9pZBrOAQoVQWRkaXRpb25hbERhdGFNZXNzYWdlEioKEXNl'
+    'bmRlcl9tZXNzYWdlX2lkGAEgASgJUg9zZW5kZXJNZXNzYWdlSWQSHAoJdGltZXN0YW1wGAIgAS'
+    'gDUgl0aW1lc3RhbXASEgoEdHlwZRgDIAEoCVIEdHlwZRI7ChdhZGRpdGlvbmFsX21lc3NhZ2Vf'
+    'ZGF0YRgEIAEoDEgAUhVhZGRpdGlvbmFsTWVzc2FnZURhdGGIAQFCGgoYX2FkZGl0aW9uYWxfbW'
+    'Vzc2FnZV9kYXRhGmQKCFJlYWN0aW9uEioKEXRhcmdldF9tZXNzYWdlX2lkGAEgASgJUg90YXJn'
+    'ZXRNZXNzYWdlSWQSFAoFZW1vamkYAiABKAlSBWVtb2ppEhYKBnJlbW92ZRgDIAEoCFIGcmVtb3'
+    'ZlGr4CCg1NZXNzYWdlVXBkYXRlEjgKBHR5cGUYASABKA4yJC5FbmNyeXB0ZWRDb250ZW50Lk1l'
+    'c3NhZ2VVcGRhdGUuVHlwZVIEdHlwZRIvChFzZW5kZXJfbWVzc2FnZV9pZBgCIAEoCUgAUg9zZW'
+    '5kZXJNZXNzYWdlSWSIAQESPQobbXVsdGlwbGVfdGFyZ2V0X21lc3NhZ2VfaWRzGAMgAygJUhht'
+    'dWx0aXBsZVRhcmdldE1lc3NhZ2VJZHMSFwoEdGV4dBgEIAEoCUgBUgR0ZXh0iAEBEhwKCXRpbW'
+    'VzdGFtcBgFIAEoA1IJdGltZXN0YW1wIi0KBFR5cGUSCgoGREVMRVRFEAASDQoJRURJVF9URVhU'
+    'EAESCgoGT1BFTkVEEAJCFAoSX3NlbmRlcl9tZXNzYWdlX2lkQgcKBV90ZXh0GoUGCgVNZWRpYR'
+    'IqChFzZW5kZXJfbWVzc2FnZV9pZBgBIAEoCVIPc2VuZGVyTWVzc2FnZUlkEjAKBHR5cGUYAiAB'
+    'KA4yHC5FbmNyeXB0ZWRDb250ZW50Lk1lZGlhLlR5cGVSBHR5cGUSRgodZGlzcGxheV9saW1pdF'
+    '9pbl9taWxsaXNlY29uZHMYAyABKANIAFIaZGlzcGxheUxpbWl0SW5NaWxsaXNlY29uZHOIAQES'
+    'NwoXcmVxdWlyZXNfYXV0aGVudGljYXRpb24YBCABKAhSFnJlcXVpcmVzQXV0aGVudGljYXRpb2'
+    '4SHAoJdGltZXN0YW1wGAUgASgDUgl0aW1lc3RhbXASLQoQcXVvdGVfbWVzc2FnZV9pZBgGIAEo'
+    'CUgBUg5xdW90ZU1lc3NhZ2VJZIgBARIqCg5kb3dubG9hZF90b2tlbhgHIAEoDEgCUg1kb3dubG'
+    '9hZFRva2VuiAEBEioKDmVuY3J5cHRpb25fa2V5GAggASgMSANSDWVuY3J5cHRpb25LZXmIAQES'
+    'KgoOZW5jcnlwdGlvbl9tYWMYCSABKAxIBFINZW5jcnlwdGlvbk1hY4gBARIuChBlbmNyeXB0aW'
+    '9uX25vbmNlGAogASgMSAVSD2VuY3J5cHRpb25Ob25jZYgBARI7ChdhZGRpdGlvbmFsX21lc3Nh'
+    'Z2VfZGF0YRgLIAEoDEgGUhVhZGRpdGlvbmFsTWVzc2FnZURhdGGIAQEiPgoEVHlwZRIMCghSRV'
+    'VQTE9BRBAAEgkKBUlNQUdFEAESCQoFVklERU8QAhIHCgNHSUYQAxIJCgVBVURJTxAEQiAKHl9k'
+    'aXNwbGF5X2xpbWl0X2luX21pbGxpc2Vjb25kc0ITChFfcXVvdGVfbWVzc2FnZV9pZEIRCg9fZG'
+    '93bmxvYWRfdG9rZW5CEQoPX2VuY3J5cHRpb25fa2V5QhEKD19lbmNyeXB0aW9uX21hY0ITChFf'
+    'ZW5jcnlwdGlvbl9ub25jZUIaChhfYWRkaXRpb25hbF9tZXNzYWdlX2RhdGEaqQEKC01lZGlhVX'
+    'BkYXRlEjYKBHR5cGUYASABKA4yIi5FbmNyeXB0ZWRDb250ZW50Lk1lZGlhVXBkYXRlLlR5cGVS'
+    'BHR5cGUSKgoRdGFyZ2V0X21lc3NhZ2VfaWQYAiABKAlSD3RhcmdldE1lc3NhZ2VJZCI2CgRUeX'
+    'BlEgwKCFJFT1BFTkVEEAASCgoGU1RPUkVEEAESFAoQREVDUllQVElPTl9FUlJPUhACGngKDkNv'
+    'bnRhY3RSZXF1ZXN0EjkKBHR5cGUYASABKA4yJS5FbmNyeXB0ZWRDb250ZW50LkNvbnRhY3RSZX'
+    'F1ZXN0LlR5cGVSBHR5cGUiKwoEVHlwZRILCgdSRVFVRVNUEAASCgoGUkVKRUNUEAESCgoGQUND'
+    'RVBUEAIapAIKDUNvbnRhY3RVcGRhdGUSOAoEdHlwZRgBIAEoDjIkLkVuY3J5cHRlZENvbnRlbn'
+    'QuQ29udGFjdFVwZGF0ZS5UeXBlUgR0eXBlEjcKFWF2YXRhcl9zdmdfY29tcHJlc3NlZBgCIAEo'
+    'DEgAUhNhdmF0YXJTdmdDb21wcmVzc2VkiAEBEh8KCHVzZXJuYW1lGAMgASgJSAFSCHVzZXJuYW'
+    '1liAEBEiYKDGRpc3BsYXlfbmFtZRgEIAEoCUgCUgtkaXNwbGF5TmFtZYgBASIfCgRUeXBlEgsK'
+    'B1JFUVVFU1QQABIKCgZVUERBVEUQAUIYChZfYXZhdGFyX3N2Z19jb21wcmVzc2VkQgsKCV91c2'
+    'VybmFtZUIPCg1fZGlzcGxheV9uYW1lGtkBCghQdXNoS2V5cxIzCgR0eXBlGAEgASgOMh8uRW5j'
+    'cnlwdGVkQ29udGVudC5QdXNoS2V5cy5UeXBlUgR0eXBlEhoKBmtleV9pZBgCIAEoA0gAUgVrZX'
+    'lJZIgBARIVCgNrZXkYAyABKAxIAVIDa2V5iAEBEiIKCmNyZWF0ZWRfYXQYBCABKANIAlIJY3Jl'
+    'YXRlZEF0iAEBIh8KBFR5cGUSCwoHUkVRVUVTVBAAEgoKBlVQREFURRABQgkKB19rZXlfaWRCBg'
+    'oEX2tleUINCgtfY3JlYXRlZF9hdBqvAQoJRmxhbWVTeW5jEiMKDWZsYW1lX2NvdW50ZXIYASAB'
+    'KANSDGZsYW1lQ291bnRlchI5ChlsYXN0X2ZsYW1lX2NvdW50ZXJfY2hhbmdlGAIgASgDUhZsYX'
+    'N0RmxhbWVDb3VudGVyQ2hhbmdlEh8KC2Jlc3RfZnJpZW5kGAMgASgIUgpiZXN0RnJpZW5kEiEK'
+    'DGZvcmNlX3VwZGF0ZRgEIAEoCFILZm9yY2VVcGRhdGUaTQoPVHlwaW5nSW5kaWNhdG9yEhsKCW'
+    'lzX3R5cGluZxgBIAEoCFIIaXNUeXBpbmcSHQoKY3JlYXRlZF9hdBgCIAEoA1IJY3JlYXRlZEF0'
+    'Gj8KFFVzZXJEaXNjb3ZlcnlSZXF1ZXN0EicKD2N1cnJlbnRfdmVyc2lvbhgBIAEoDFIOY3Vycm'
+    'VudFZlcnNpb24aMQoTVXNlckRpc2NvdmVyeVVwZGF0ZRIaCghtZXNzYWdlcxgBIAMoDFIIbWVz'
+    'c2FnZXNCCwoJX2dyb3VwX2lkQhEKD19pc19kaXJlY3RfY2hhdEIZChdfc2VuZGVyX3Byb2ZpbG'
+    'VfY291bnRlckIgCh5fc2VuZGVyX3VzZXJfZGlzY292ZXJ5X3ZlcnNpb25CEQoPX21lc3NhZ2Vf'
+    'dXBkYXRlQggKBl9tZWRpYUIPCg1fbWVkaWFfdXBkYXRlQhEKD19jb250YWN0X3VwZGF0ZUISCh'
+    'BfY29udGFjdF9yZXF1ZXN0Qg0KC19mbGFtZV9zeW5jQgwKCl9wdXNoX2tleXNCCwoJX3JlYWN0'
+    'aW9uQg8KDV90ZXh0X21lc3NhZ2VCDwoNX2dyb3VwX2NyZWF0ZUINCgtfZ3JvdXBfam9pbkIPCg'
+    '1fZ3JvdXBfdXBkYXRlQhoKGF9yZXNlbmRfZ3JvdXBfcHVibGljX2tleUIRCg9fZXJyb3JfbWVz'
+    'c2FnZXNCGgoYX2FkZGl0aW9uYWxfZGF0YV9tZXNzYWdlQhMKEV90eXBpbmdfaW5kaWNhdG9yQh'
+    'kKF191c2VyX2Rpc2NvdmVyeV9yZXF1ZXN0QhgKFl91c2VyX2Rpc2NvdmVyeV91cGRhdGU=');
--- a/lib/src/model/protobuf/client/generated/push_notification.pb.dart
+++ b/lib/src/model/protobuf/client/generated/push_notification.pb.dart
@ -48,7 +48,7 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'EncryptedPushNotification',
      createEmptyInstance: create)
-    ..aInt64(1, _omitFieldNames ? '' : 'keyId', protoName: 'keyId')
+    ..aInt64(1, _omitFieldNames ? '' : 'keyId')
    ..a<$core.List<$core.int>>(
        2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
    ..a<$core.List<$core.int>>(
@ -143,12 +143,11 @@ class PushNotification extends $pb.GeneratedMessage {
      _omitMessageNames ? '' : 'PushNotification',
      createEmptyInstance: create)
    ..e<PushKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE,
-        defaultOrMaker: PushKind.reaction,
+        defaultOrMaker: PushKind.REACTION,
        valueOf: PushKind.valueOf,
        enumValues: PushKind.values)
-    ..aOS(2, _omitFieldNames ? '' : 'messageId', protoName: 'messageId')
-    ..aOS(3, _omitFieldNames ? '' : 'additionalContent',
-        protoName: 'additionalContent')
+    ..aOS(2, _omitFieldNames ? '' : 'messageId')
+    ..aOS(3, _omitFieldNames ? '' : 'additionalContent')
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -277,12 +276,12 @@ class PushUser extends $pb.GeneratedMessage {
  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
      _omitMessageNames ? '' : 'PushUser',
      createEmptyInstance: create)
-    ..aInt64(1, _omitFieldNames ? '' : 'userId', protoName: 'userId')
-    ..aOS(2, _omitFieldNames ? '' : 'displayName', protoName: 'displayName')
+    ..aInt64(1, _omitFieldNames ? '' : 'userId')
+    ..aOS(2, _omitFieldNames ? '' : 'displayName')
    ..aOB(3, _omitFieldNames ? '' : 'blocked')
-    ..aOS(4, _omitFieldNames ? '' : 'lastMessageId', protoName: 'lastMessageId')
+    ..aOS(4, _omitFieldNames ? '' : 'lastMessageId')
    ..pc<PushKey>(5, _omitFieldNames ? '' : 'pushKeys', $pb.PbFieldType.PM,
-        protoName: 'pushKeys', subBuilder: PushKey.create)
+        subBuilder: PushKey.create)
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@ -373,8 +372,7 @@ class PushKey extends $pb.GeneratedMessage {
    ..aInt64(1, _omitFieldNames ? '' : 'id')
    ..a<$core.List<$core.int>>(
        2, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
-    ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp',
-        protoName: 'createdAtUnixTimestamp')
+    ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp')
    ..hasRequiredFields = false;

  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
--- a/lib/src/model/protobuf/client/generated/push_notification.pbenum.dart
+++ b/lib/src/model/protobuf/client/generated/push_notification.pbenum.dart
@ -15,54 +15,54 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;

 class PushKind extends $pb.ProtobufEnum {
-  static const PushKind reaction =
-      PushKind._(0, _omitEnumNames ? '' : 'reaction');
-  static const PushKind response =
-      PushKind._(1, _omitEnumNames ? '' : 'response');
-  static const PushKind text = PushKind._(2, _omitEnumNames ? '' : 'text');
-  static const PushKind video = PushKind._(3, _omitEnumNames ? '' : 'video');
-  static const PushKind twonly = PushKind._(4, _omitEnumNames ? '' : 'twonly');
-  static const PushKind image = PushKind._(5, _omitEnumNames ? '' : 'image');
-  static const PushKind contactRequest =
-      PushKind._(6, _omitEnumNames ? '' : 'contactRequest');
-  static const PushKind acceptRequest =
-      PushKind._(7, _omitEnumNames ? '' : 'acceptRequest');
-  static const PushKind storedMediaFile =
-      PushKind._(8, _omitEnumNames ? '' : 'storedMediaFile');
-  static const PushKind testNotification =
-      PushKind._(9, _omitEnumNames ? '' : 'testNotification');
-  static const PushKind reopenedMedia =
-      PushKind._(10, _omitEnumNames ? '' : 'reopenedMedia');
-  static const PushKind reactionToVideo =
-      PushKind._(11, _omitEnumNames ? '' : 'reactionToVideo');
-  static const PushKind reactionToText =
-      PushKind._(12, _omitEnumNames ? '' : 'reactionToText');
-  static const PushKind reactionToImage =
-      PushKind._(13, _omitEnumNames ? '' : 'reactionToImage');
-  static const PushKind reactionToAudio =
-      PushKind._(14, _omitEnumNames ? '' : 'reactionToAudio');
-  static const PushKind addedToGroup =
-      PushKind._(15, _omitEnumNames ? '' : 'addedToGroup');
-  static const PushKind audio = PushKind._(16, _omitEnumNames ? '' : 'audio');
+  static const PushKind REACTION =
+      PushKind._(0, _omitEnumNames ? '' : 'REACTION');
+  static const PushKind RESPONSE =
+      PushKind._(1, _omitEnumNames ? '' : 'RESPONSE');
+  static const PushKind TEXT = PushKind._(2, _omitEnumNames ? '' : 'TEXT');
+  static const PushKind VIDEO = PushKind._(3, _omitEnumNames ? '' : 'VIDEO');
+  static const PushKind TWONLY = PushKind._(4, _omitEnumNames ? '' : 'TWONLY');
+  static const PushKind IMAGE = PushKind._(5, _omitEnumNames ? '' : 'IMAGE');
+  static const PushKind CONTACT_REQUEST =
+      PushKind._(6, _omitEnumNames ? '' : 'CONTACT_REQUEST');
+  static const PushKind ACCEPT_REQUEST =
+      PushKind._(7, _omitEnumNames ? '' : 'ACCEPT_REQUEST');
+  static const PushKind STORED_MEDIA_FILE =
+      PushKind._(8, _omitEnumNames ? '' : 'STORED_MEDIA_FILE');
+  static const PushKind TEST_NOTIFICATION =
+      PushKind._(9, _omitEnumNames ? '' : 'TEST_NOTIFICATION');
+  static const PushKind REOPENED_MEDIA =
+      PushKind._(10, _omitEnumNames ? '' : 'REOPENED_MEDIA');
+  static const PushKind REACTION_TO_VIDEO =
+      PushKind._(11, _omitEnumNames ? '' : 'REACTION_TO_VIDEO');
+  static const PushKind REACTION_TO_TEXT =
+      PushKind._(12, _omitEnumNames ? '' : 'REACTION_TO_TEXT');
+  static const PushKind REACTION_TO_IMAGE =
+      PushKind._(13, _omitEnumNames ? '' : 'REACTION_TO_IMAGE');
+  static const PushKind REACTION_TO_AUDIO =
+      PushKind._(14, _omitEnumNames ? '' : 'REACTION_TO_AUDIO');
+  static const PushKind ADDED_TO_GROUP =
+      PushKind._(15, _omitEnumNames ? '' : 'ADDED_TO_GROUP');
+  static const PushKind AUDIO = PushKind._(16, _omitEnumNames ? '' : 'AUDIO');

  static const $core.List<PushKind> values = <PushKind>[
-    reaction,
-    response,
-    text,
-    video,
-    twonly,
-    image,
-    contactRequest,
-    acceptRequest,
-    storedMediaFile,
-    testNotification,
-    reopenedMedia,
-    reactionToVideo,
-    reactionToText,
-    reactionToImage,
-    reactionToAudio,
-    addedToGroup,
-    audio,
+    REACTION,
+    RESPONSE,
+    TEXT,
+    VIDEO,
+    TWONLY,
+    IMAGE,
+    CONTACT_REQUEST,
+    ACCEPT_REQUEST,
+    STORED_MEDIA_FILE,
+    TEST_NOTIFICATION,
+    REOPENED_MEDIA,
+    REACTION_TO_VIDEO,
+    REACTION_TO_TEXT,
+    REACTION_TO_IMAGE,
+    REACTION_TO_AUDIO,
+    ADDED_TO_GROUP,
+    AUDIO,
  ];

  static final $core.List<PushKind?> _byValue =
--- a/lib/src/model/protobuf/client/generated/push_notification.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/push_notification.pbjson.dart
@ -18,40 +18,40 @@ import 'dart:typed_data' as $typed_data;
 const PushKind$json = {
  '1': 'PushKind',
  '2': [
-    {'1': 'reaction', '2': 0},
-    {'1': 'response', '2': 1},
-    {'1': 'text', '2': 2},
-    {'1': 'video', '2': 3},
-    {'1': 'twonly', '2': 4},
-    {'1': 'image', '2': 5},
-    {'1': 'contactRequest', '2': 6},
-    {'1': 'acceptRequest', '2': 7},
-    {'1': 'storedMediaFile', '2': 8},
-    {'1': 'testNotification', '2': 9},
-    {'1': 'reopenedMedia', '2': 10},
-    {'1': 'reactionToVideo', '2': 11},
-    {'1': 'reactionToText', '2': 12},
-    {'1': 'reactionToImage', '2': 13},
-    {'1': 'reactionToAudio', '2': 14},
-    {'1': 'addedToGroup', '2': 15},
-    {'1': 'audio', '2': 16},
+    {'1': 'REACTION', '2': 0},
+    {'1': 'RESPONSE', '2': 1},
+    {'1': 'TEXT', '2': 2},
+    {'1': 'VIDEO', '2': 3},
+    {'1': 'TWONLY', '2': 4},
+    {'1': 'IMAGE', '2': 5},
+    {'1': 'CONTACT_REQUEST', '2': 6},
+    {'1': 'ACCEPT_REQUEST', '2': 7},
+    {'1': 'STORED_MEDIA_FILE', '2': 8},
+    {'1': 'TEST_NOTIFICATION', '2': 9},
+    {'1': 'REOPENED_MEDIA', '2': 10},
+    {'1': 'REACTION_TO_VIDEO', '2': 11},
+    {'1': 'REACTION_TO_TEXT', '2': 12},
+    {'1': 'REACTION_TO_IMAGE', '2': 13},
+    {'1': 'REACTION_TO_AUDIO', '2': 14},
+    {'1': 'ADDED_TO_GROUP', '2': 15},
+    {'1': 'AUDIO', '2': 16},
  ],
 };

 /// Descriptor for `PushKind`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List pushKindDescriptor = $convert.base64Decode(
-    'CghQdXNoS2luZBIMCghyZWFjdGlvbhAAEgwKCHJlc3BvbnNlEAESCAoEdGV4dBACEgkKBXZpZG'
-    'VvEAMSCgoGdHdvbmx5EAQSCQoFaW1hZ2UQBRISCg5jb250YWN0UmVxdWVzdBAGEhEKDWFjY2Vw'
-    'dFJlcXVlc3QQBxITCg9zdG9yZWRNZWRpYUZpbGUQCBIUChB0ZXN0Tm90aWZpY2F0aW9uEAkSEQ'
-    'oNcmVvcGVuZWRNZWRpYRAKEhMKD3JlYWN0aW9uVG9WaWRlbxALEhIKDnJlYWN0aW9uVG9UZXh0'
-    'EAwSEwoPcmVhY3Rpb25Ub0ltYWdlEA0SEwoPcmVhY3Rpb25Ub0F1ZGlvEA4SEAoMYWRkZWRUb0'
-    'dyb3VwEA8SCQoFYXVkaW8QEA==');
+    'CghQdXNoS2luZBIMCghSRUFDVElPThAAEgwKCFJFU1BPTlNFEAESCAoEVEVYVBACEgkKBVZJRE'
+    'VPEAMSCgoGVFdPTkxZEAQSCQoFSU1BR0UQBRITCg9DT05UQUNUX1JFUVVFU1QQBhISCg5BQ0NF'
+    'UFRfUkVRVUVTVBAHEhUKEVNUT1JFRF9NRURJQV9GSUxFEAgSFQoRVEVTVF9OT1RJRklDQVRJT0'
+    '4QCRISCg5SRU9QRU5FRF9NRURJQRAKEhUKEVJFQUNUSU9OX1RPX1ZJREVPEAsSFAoQUkVBQ1RJ'
+    'T05fVE9fVEVYVBAMEhUKEVJFQUNUSU9OX1RPX0lNQUdFEA0SFQoRUkVBQ1RJT05fVE9fQVVESU'
+    '8QDhISCg5BRERFRF9UT19HUk9VUBAPEgkKBUFVRElPEBA=');

@$core.Deprecated('Use encryptedPushNotificationDescriptor instead')
 const EncryptedPushNotification$json = {
  '1': 'EncryptedPushNotification',
  '2': [
-    {'1': 'keyId', '3': 1, '4': 1, '5': 3, '10': 'keyId'},
+    {'1': 'key_id', '3': 1, '4': 1, '5': 3, '10': 'keyId'},
    {'1': 'nonce', '3': 2, '4': 1, '5': 12, '10': 'nonce'},
    {'1': 'ciphertext', '3': 3, '4': 1, '5': 12, '10': 'ciphertext'},
    {'1': 'mac', '3': 4, '4': 1, '5': 12, '10': 'mac'},
@ -60,9 +60,9 @@ const EncryptedPushNotification$json = {

 /// Descriptor for `EncryptedPushNotification`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedPushNotificationDescriptor = $convert.base64Decode(
-    'ChlFbmNyeXB0ZWRQdXNoTm90aWZpY2F0aW9uEhQKBWtleUlkGAEgASgDUgVrZXlJZBIUCgVub2'
-    '5jZRgCIAEoDFIFbm9uY2USHgoKY2lwaGVydGV4dBgDIAEoDFIKY2lwaGVydGV4dBIQCgNtYWMY'
-    'BCABKAxSA21hYw==');
+    'ChlFbmNyeXB0ZWRQdXNoTm90aWZpY2F0aW9uEhUKBmtleV9pZBgBIAEoA1IFa2V5SWQSFAoFbm'
+    '9uY2UYAiABKAxSBW5vbmNlEh4KCmNpcGhlcnRleHQYAyABKAxSCmNpcGhlcnRleHQSEAoDbWFj'
+    'GAQgASgMUgNtYWM=');

@$core.Deprecated('Use pushNotificationDescriptor instead')
 const PushNotification$json = {
@ -70,7 +70,7 @@ const PushNotification$json = {
  '2': [
    {'1': 'kind', '3': 1, '4': 1, '5': 14, '6': '.PushKind', '10': 'kind'},
    {
-      '1': 'messageId',
+      '1': 'message_id',
      '3': 2,
      '4': 1,
      '5': 9,
@ -79,7 +79,7 @@ const PushNotification$json = {
      '17': true
    },
    {
-      '1': 'additionalContent',
+      '1': 'additional_content',
      '3': 3,
      '4': 1,
      '5': 9,
@ -89,17 +89,17 @@ const PushNotification$json = {
    },
  ],
  '8': [
-    {'1': '_messageId'},
-    {'1': '_additionalContent'},
+    {'1': '_message_id'},
+    {'1': '_additional_content'},
  ],
 };

 /// Descriptor for `PushNotification`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List pushNotificationDescriptor = $convert.base64Decode(
-    'ChBQdXNoTm90aWZpY2F0aW9uEh0KBGtpbmQYASABKA4yCS5QdXNoS2luZFIEa2luZBIhCgltZX'
-    'NzYWdlSWQYAiABKAlIAFIJbWVzc2FnZUlkiAEBEjEKEWFkZGl0aW9uYWxDb250ZW50GAMgASgJ'
-    'SAFSEWFkZGl0aW9uYWxDb250ZW50iAEBQgwKCl9tZXNzYWdlSWRCFAoSX2FkZGl0aW9uYWxDb2'
-    '50ZW50');
+    'ChBQdXNoTm90aWZpY2F0aW9uEh0KBGtpbmQYASABKA4yCS5QdXNoS2luZFIEa2luZBIiCgptZX'
+    'NzYWdlX2lkGAIgASgJSABSCW1lc3NhZ2VJZIgBARIyChJhZGRpdGlvbmFsX2NvbnRlbnQYAyAB'
+    'KAlIAVIRYWRkaXRpb25hbENvbnRlbnSIAQFCDQoLX21lc3NhZ2VfaWRCFQoTX2FkZGl0aW9uYW'
+    'xfY29udGVudA==');

@$core.Deprecated('Use pushUsersDescriptor instead')
 const PushUsers$json = {
@ -117,11 +117,11 @@ final $typed_data.Uint8List pushUsersDescriptor = $convert.base64Decode(
 const PushUser$json = {
  '1': 'PushUser',
  '2': [
-    {'1': 'userId', '3': 1, '4': 1, '5': 3, '10': 'userId'},
-    {'1': 'displayName', '3': 2, '4': 1, '5': 9, '10': 'displayName'},
+    {'1': 'user_id', '3': 1, '4': 1, '5': 3, '10': 'userId'},
+    {'1': 'display_name', '3': 2, '4': 1, '5': 9, '10': 'displayName'},
    {'1': 'blocked', '3': 3, '4': 1, '5': 8, '10': 'blocked'},
    {
-      '1': 'lastMessageId',
+      '1': 'last_message_id',
      '3': 4,
      '4': 1,
      '5': 9,
@ -130,7 +130,7 @@ const PushUser$json = {
      '17': true
    },
    {
-      '1': 'pushKeys',
+      '1': 'push_keys',
      '3': 5,
      '4': 3,
      '5': 11,
@ -139,16 +139,16 @@ const PushUser$json = {
    },
  ],
  '8': [
-    {'1': '_lastMessageId'},
+    {'1': '_last_message_id'},
  ],
 };

 /// Descriptor for `PushUser`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List pushUserDescriptor = $convert.base64Decode(
-    'CghQdXNoVXNlchIWCgZ1c2VySWQYASABKANSBnVzZXJJZBIgCgtkaXNwbGF5TmFtZRgCIAEoCV'
-    'ILZGlzcGxheU5hbWUSGAoHYmxvY2tlZBgDIAEoCFIHYmxvY2tlZBIpCg1sYXN0TWVzc2FnZUlk'
-    'GAQgASgJSABSDWxhc3RNZXNzYWdlSWSIAQESJAoIcHVzaEtleXMYBSADKAsyCC5QdXNoS2V5Ug'
-    'hwdXNoS2V5c0IQCg5fbGFzdE1lc3NhZ2VJZA==');
+    'CghQdXNoVXNlchIXCgd1c2VyX2lkGAEgASgDUgZ1c2VySWQSIQoMZGlzcGxheV9uYW1lGAIgAS'
+    'gJUgtkaXNwbGF5TmFtZRIYCgdibG9ja2VkGAMgASgIUgdibG9ja2VkEisKD2xhc3RfbWVzc2Fn'
+    'ZV9pZBgEIAEoCUgAUg1sYXN0TWVzc2FnZUlkiAEBEiUKCXB1c2hfa2V5cxgFIAMoCzIILlB1c2'
+    'hLZXlSCHB1c2hLZXlzQhIKEF9sYXN0X21lc3NhZ2VfaWQ=');

@$core.Deprecated('Use pushKeyDescriptor instead')
 const PushKey$json = {
@ -157,7 +157,7 @@ const PushKey$json = {
    {'1': 'id', '3': 1, '4': 1, '5': 3, '10': 'id'},
    {'1': 'key', '3': 2, '4': 1, '5': 12, '10': 'key'},
    {
-      '1': 'createdAtUnixTimestamp',
+      '1': 'created_at_unix_timestamp',
      '3': 3,
      '4': 1,
      '5': 3,
@ -168,5 +168,5 @@ const PushKey$json = {

 /// Descriptor for `PushKey`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List pushKeyDescriptor = $convert.base64Decode(
-    'CgdQdXNoS2V5Eg4KAmlkGAEgASgDUgJpZBIQCgNrZXkYAiABKAxSA2tleRI2ChZjcmVhdGVkQX'
-    'RVbml4VGltZXN0YW1wGAMgASgDUhZjcmVhdGVkQXRVbml4VGltZXN0YW1w');
+    'CgdQdXNoS2V5Eg4KAmlkGAEgASgDUgJpZBIQCgNrZXkYAiABKAxSA2tleRI5ChljcmVhdGVkX2'
+    'F0X3VuaXhfdGltZXN0YW1wGAMgASgDUhZjcmVhdGVkQXRVbml4VGltZXN0YW1w');
--- a/lib/src/model/protobuf/client/generated/qr.pb.dart
+++ b/lib/src/model/protobuf/client/generated/qr.pb.dart
@ -45,7 +45,7 @@ class QREnvelope extends $pb.GeneratedMessage {
      _omitMessageNames ? '' : 'QREnvelope',
      createEmptyInstance: create)
    ..e<QREnvelope_Type>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: QREnvelope_Type.PublicProfile,
+        defaultOrMaker: QREnvelope_Type.PUBLIC_PROFILE,
        valueOf: QREnvelope_Type.valueOf,
        enumValues: QREnvelope_Type.values)
    ..a<$core.List<$core.int>>(
--- a/lib/src/model/protobuf/client/generated/qr.pbenum.dart
+++ b/lib/src/model/protobuf/client/generated/qr.pbenum.dart
@ -15,11 +15,11 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;

 class QREnvelope_Type extends $pb.ProtobufEnum {
-  static const QREnvelope_Type PublicProfile =
-      QREnvelope_Type._(0, _omitEnumNames ? '' : 'PublicProfile');
+  static const QREnvelope_Type PUBLIC_PROFILE =
+      QREnvelope_Type._(0, _omitEnumNames ? '' : 'PUBLIC_PROFILE');

  static const $core.List<QREnvelope_Type> values = <QREnvelope_Type>[
-    PublicProfile,
+    PUBLIC_PROFILE,
  ];

  static final $core.List<QREnvelope_Type?> _byValue =
--- a/lib/src/model/protobuf/client/generated/qr.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/qr.pbjson.dart
@ -35,14 +35,14 @@ const QREnvelope$json = {
 const QREnvelope_Type$json = {
  '1': 'Type',
  '2': [
-    {'1': 'PublicProfile', '2': 0},
+    {'1': 'PUBLIC_PROFILE', '2': 0},
  ],
 };

 /// Descriptor for `QREnvelope`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List qREnvelopeDescriptor = $convert.base64Decode(
    'CgpRUkVudmVsb3BlEiQKBHR5cGUYAiABKA4yEC5RUkVudmVsb3BlLlR5cGVSBHR5cGUSEgoEZG'
-    'F0YRgDIAEoDFIEZGF0YSIZCgRUeXBlEhEKDVB1YmxpY1Byb2ZpbGUQAA==');
+    'F0YRgDIAEoDFIEZGF0YSIaCgRUeXBlEhIKDlBVQkxJQ19QUk9GSUxFEAA=');

@$core.Deprecated('Use publicProfileDescriptor instead')
 const PublicProfile$json = {
--- a/lib/src/model/protobuf/client/groups.proto
+++ b/lib/src/model/protobuf/client/groups.proto
@ -2,10 +2,10 @@ syntax = "proto3";

 // Stored encrypted on the server in the members columns.
 message EncryptedGroupState {
-    repeated int64 memberIds = 1; 
-    repeated int64 adminIds = 2; 
-    string groupName = 3;
-    optional int64 deleteMessagesAfterMilliseconds = 4;
+  repeated int64 member_ids                         = 1;
+  repeated int64 admin_ids                          = 2;
+  string         group_name                         = 3;
+  optional int64 delete_messages_after_milliseconds = 4;
  bytes          padding                            = 5;
 }

@ -18,6 +18,6 @@ message EncryptedAppendedGroupState {

 message EncryptedGroupStateEnvelop {
  bytes nonce                 = 1;
-    bytes encryptedGroupState = 2;
+  bytes encrypted_group_state = 2;
  bytes mac                   = 3;
 }
--- a/lib/src/model/protobuf/client/messages.proto
+++ b/lib/src/model/protobuf/client/messages.proto
@ -9,14 +9,14 @@ message Message {
    TEST_NOTIFICATION       = 4;
  }
  Type                      type              = 1;
-    string receiptId = 2;
-    optional bytes encryptedContent = 3;
-    optional PlaintextContent plaintextContent = 4;
+  string                    receipt_id        = 2;
+  optional bytes            encrypted_content = 3;
+  optional PlaintextContent plaintext_content = 4;
 }

 message PlaintextContent {
-    optional DecryptionErrorMessage decryptionErrorMessage = 1;
-    optional RetryErrorMessage retryControlError = 2; 
+  optional DecryptionErrorMessage decryption_error_message = 1;
+  optional RetryErrorMessage      retry_control_error      = 2;

  message RetryErrorMessage { }

@ -29,31 +29,33 @@ message PlaintextContent {
  }
 }

-
 message EncryptedContent {

-    optional string groupId = 2;
-    optional bool isDirectChat = 3;
+  optional string group_id       = 2;
+  optional bool   is_direct_chat = 3;

    /// This can be added, so the receiver can check weather he is up to date with the current profile
-    optional int64 senderProfileCounter = 4;
+  optional int64 sender_profile_counter        = 4;
+  optional bytes sender_user_discovery_version = 21;

-    optional MessageUpdate messageUpdate  = 5;
+  optional MessageUpdate         message_update          = 5;
  optional Media                 media                   = 6;
-    optional MediaUpdate mediaUpdate = 7;
-    optional ContactUpdate contactUpdate = 8;
-    optional ContactRequest contactRequest = 9;
-    optional FlameSync flameSync = 10;
-    optional PushKeys pushKeys = 11;
+  optional MediaUpdate           media_update            = 7;
+  optional ContactUpdate         contact_update          = 8;
+  optional ContactRequest        contact_request         = 9;
+  optional FlameSync             flame_sync              = 10;
+  optional PushKeys              push_keys               = 11;
  optional Reaction              reaction                = 12;
-    optional TextMessage textMessage  = 13;
-    optional GroupCreate groupCreate  = 14;
-    optional GroupJoin groupJoin  = 15;
-    optional GroupUpdate groupUpdate  = 16;
-    optional ResendGroupPublicKey resendGroupPublicKey = 17;
+  optional TextMessage           text_message            = 13;
+  optional GroupCreate           group_create            = 14;
+  optional GroupJoin             group_join              = 15;
+  optional GroupUpdate           group_update            = 16;
+  optional ResendGroupPublicKey  resend_group_public_key = 17;
  optional ErrorMessages         error_messages          = 18;
  optional AdditionalDataMessage additional_data_message = 19;
  optional TypingIndicator       typing_indicator        = 20;
+  optional UserDiscoveryRequest  user_discovery_request  = 22;
+  optional UserDiscoveryUpdate   user_discovery_update   = 23;

  message ErrorMessages {
    enum Type {
@ -65,16 +67,15 @@ message EncryptedContent {
    string related_receipt_id = 2;
  }

-
  message GroupCreate {
    // key for the state stored on the server
-        bytes stateKey = 3;
-        bytes groupPublicKey = 4;
+    bytes state_key        = 3;
+    bytes group_public_key = 4;
  }

  message GroupJoin {
        // key for the state stored on the server
-        bytes groupPublicKey = 1;
+    bytes group_public_key = 1;
  }

  message ResendGroupPublicKey {
@ -82,17 +83,17 @@ message EncryptedContent {
  }

  message GroupUpdate {
-        string groupActionType = 1; // GroupActionType.name
-        optional int64 affectedContactId = 2;
-        optional string newGroupName = 3;
-        optional int64 newDeleteMessagesAfterMilliseconds = 4;
+    string          group_action_type                      = 1; // GroupActionType.name
+    optional int64  affected_contact_id                    = 2;
+    optional string new_group_name                         = 3;
+    optional int64  new_delete_messages_after_milliseconds = 4;
  }

  message TextMessage {
-        string senderMessageId = 1;
+    string          sender_message_id = 1;
    string          text              = 2;
    int64           timestamp         = 3;
-        optional string quoteMessageId = 4;
+    optional string quote_message_id  = 4;
  }

  message AdditionalDataMessage {
@ -103,7 +104,7 @@ message EncryptedContent {
  }

  message Reaction {
-        string targetMessageId = 1;
+    string target_message_id = 1;
    string emoji             = 2;
    bool   remove            = 3;
  }
@ -115,8 +116,8 @@ message EncryptedContent {
      OPENED    = 2;
    }
    Type            type                        = 1;
-        optional string senderMessageId = 2;
-        repeated string multipleTargetMessageIds = 3;
+    optional string sender_message_id           = 2;
+    repeated string multiple_target_message_ids = 3;
    optional string text                        = 4;
    int64           timestamp                   = 5;
  }
@ -130,17 +131,17 @@ message EncryptedContent {
      AUDIO    = 4;
    }

-        string senderMessageId = 1;
+    string          sender_message_id             = 1;
    Type            type                          = 2;
-        optional int64 displayLimitInMilliseconds = 3;
-        bool requiresAuthentication = 4;
+    optional int64  display_limit_in_milliseconds = 3;
+    bool            requires_authentication       = 4;
    int64           timestamp                     = 5;
-        optional string quoteMessageId = 6;
+    optional string quote_message_id              = 6;

-        optional bytes downloadToken = 7;
-        optional bytes encryptionKey = 8;
-        optional bytes encryptionMac = 9;
-        optional bytes encryptionNonce = 10;
+    optional bytes download_token   = 7;
+    optional bytes encryption_key   = 8;
+    optional bytes encryption_mac   = 9;
+    optional bytes encryption_nonce = 10;

    optional bytes additional_message_data = 11;
  }
@ -152,7 +153,7 @@ message EncryptedContent {
      DECRYPTION_ERROR = 2;
    }
    Type   type              = 1;
-        string targetMessageId = 2;
+    string target_message_id = 2;
  }

  message ContactRequest {
@ -171,9 +172,9 @@ message EncryptedContent {
    }

    Type            type                  = 1;
-        optional bytes avatarSvgCompressed = 2;
+    optional bytes  avatar_svg_compressed = 2;
    optional string username              = 3;
-        optional string displayName = 4;
+    optional string display_name          = 4;
  }

  message PushKeys {
@ -183,16 +184,16 @@ message EncryptedContent {
    }

    Type           type       = 1;
-        optional int64 keyId = 2;
+    optional int64 key_id     = 2;
    optional bytes key        = 3;
-        optional int64 createdAt = 4;
+    optional int64 created_at = 4;
  }

  message FlameSync {
-        int64 flameCounter = 1;
-        int64 lastFlameCounterChange = 2;
-        bool bestFriend = 3;
-        bool forceUpdate = 4;
+    int64 flame_counter             = 1;
+    int64 last_flame_counter_change = 2;
+    bool  best_friend               = 3;
+    bool  force_update              = 4;
  }

  message TypingIndicator {
@ -200,4 +201,12 @@ message EncryptedContent {
    int64 created_at = 2;
  }

+  message UserDiscoveryRequest  {
+    bytes current_version = 1;
+  }
+
+  message UserDiscoveryUpdate {
+    repeated bytes messages = 1;
+  }
+
 }
--- a/lib/src/model/protobuf/client/push_notification.proto
+++ b/lib/src/model/protobuf/client/push_notification.proto
@ -1,53 +1,52 @@
 syntax = "proto3";

 message EncryptedPushNotification {
-    int64 keyId = 1;
+  int64 key_id     = 1;
  bytes nonce      = 2;
  bytes ciphertext = 3;
  bytes mac        = 4;
 }

 enum PushKind {
-    reaction = 0;
-    response = 1;
-    text = 2;
-    video = 3;
-    twonly = 4;
-    image = 5;
-    contactRequest = 6;
-    acceptRequest = 7;
-    storedMediaFile = 8;
-    testNotification = 9;
-    reopenedMedia = 10;
-    reactionToVideo = 11;
-    reactionToText = 12;
-    reactionToImage = 13;
-    reactionToAudio = 14;
-    addedToGroup = 15;
-    audio = 16;
+  REACTION          = 0;
+  RESPONSE          = 1;
+  TEXT              = 2;
+  VIDEO             = 3;
+  TWONLY            = 4;
+  IMAGE             = 5;
+  CONTACT_REQUEST   = 6;
+  ACCEPT_REQUEST    = 7;
+  STORED_MEDIA_FILE = 8;
+  TEST_NOTIFICATION = 9;
+  REOPENED_MEDIA    = 10;
+  REACTION_TO_VIDEO = 11;
+  REACTION_TO_TEXT  = 12;
+  REACTION_TO_IMAGE = 13;
+  REACTION_TO_AUDIO = 14;
+  ADDED_TO_GROUP    = 15;
+  AUDIO             = 16;
 };

 message PushNotification {
  PushKind        kind               = 1;
-    optional string messageId = 2;
-    optional string additionalContent = 3;
+  optional string message_id         = 2;
+  optional string additional_content = 3;
 }

-
 message PushUsers {
  repeated PushUser users = 1;
 }

 message PushUser {
-    int64 userId = 1;
-    string displayName = 2;
+  int64            user_id         = 1;
+  string           display_name    = 2;
  bool             blocked         = 3;
-    optional string lastMessageId = 4;
-    repeated PushKey pushKeys = 5;
+  optional string  last_message_id = 4;
+  repeated PushKey push_keys       = 5;
 }

 message PushKey {
  int64 id                        = 1;
  bytes key                       = 2;
-    int64 createdAtUnixTimestamp = 3;
+  int64 created_at_unix_timestamp = 3;
 }
--- a/lib/src/model/protobuf/client/qr.proto
+++ b/lib/src/model/protobuf/client/qr.proto
@ -2,7 +2,7 @@ syntax = "proto3";

 message QREnvelope {
  enum Type {
-        PublicProfile = 0;
+    PUBLIC_PROFILE = 0;
  }
  Type  type = 2;
  bytes data = 3;
--- a/lib/src/services/api/messages.dart
+++ b/lib/src/services/api/messages.dart
@ -120,7 +120,7 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
    }

    if (message.type == pb.Message_Type.TEST_NOTIFICATION) {
-      pushData = (PushNotification()..kind = PushKind.testNotification)
+      pushData = (PushNotification()..kind = PushKind.TEST_NOTIFICATION)
          .writeToBuffer();
    }

--- a/lib/src/services/notifications/background.notifications.dart
+++ b/lib/src/services/notifications/background.notifications.dart
@ -100,7 +100,7 @@ Future<void> handlePushData(String pushDataB64) async {
    }

    if (pushNotification != null) {
-      if (pushNotification.kind == PushKind.testNotification) {
+      if (pushNotification.kind == PushKind.TEST_NOTIFICATION) {
        await customLocalPushNotification(
          'Test notification',
          'This is a test notification.',
@ -206,13 +206,13 @@ Future<void> showLocalPushNotification(
  String? payload;

  if (groupId != null &&
-      (pushNotification.kind == PushKind.text ||
-          pushNotification.kind == PushKind.response ||
-          pushNotification.kind == PushKind.reactionToAudio ||
-          pushNotification.kind == PushKind.storedMediaFile ||
-          pushNotification.kind == PushKind.reactionToImage ||
-          pushNotification.kind == PushKind.reactionToText ||
-          pushNotification.kind == PushKind.reactionToAudio)) {
+      (pushNotification.kind == PushKind.TEXT ||
+          pushNotification.kind == PushKind.RESPONSE ||
+          pushNotification.kind == PushKind.REACTION_TO_AUDIO ||
+          pushNotification.kind == PushKind.STORED_MEDIA_FILE ||
+          pushNotification.kind == PushKind.REACTION_TO_IMAGE ||
+          pushNotification.kind == PushKind.REACTION_TO_TEXT ||
+          pushNotification.kind == PushKind.REACTION_TO_VIDEO)) {
    payload = Routes.chatsMessages(groupId);
  }

@ -234,7 +234,7 @@ Future<void> showLocalPushNotificationWithoutUserId(
  var title = lang.notificationTitleUnknown;
  var body = lang.notificationBodyUnknown;

-  if (pushNotification.kind == PushKind.contactRequest) {
+  if (pushNotification.kind == PushKind.CONTACT_REQUEST) {
    title = lang.you;
    body = lang.notificationContactRequestUnknownUser;
  }
@ -291,30 +291,30 @@ String getPushNotificationText(PushNotification pushNotification) {
  }

  final pushNotificationText = {
-    PushKind.text.name: lang.notificationText(inGroup),
-    PushKind.twonly.name: lang.notificationTwonly(inGroup),
-    PushKind.video.name: lang.notificationVideo(inGroup),
-    PushKind.image.name: lang.notificationImage(inGroup),
-    PushKind.audio.name: lang.notificationAudio(inGroup),
-    PushKind.contactRequest.name: lang.notificationContactRequest,
-    PushKind.acceptRequest.name: lang.notificationAcceptRequest,
-    PushKind.storedMediaFile.name: lang.notificationStoredMediaFile,
-    PushKind.reaction.name: lang.notificationReaction,
-    PushKind.reopenedMedia.name: lang.notificationReopenedMedia,
-    PushKind.reactionToVideo.name: lang.notificationReactionToVideo(
+    PushKind.TEXT.name: lang.notificationText(inGroup),
+    PushKind.TWONLY.name: lang.notificationTwonly(inGroup),
+    PushKind.VIDEO.name: lang.notificationVideo(inGroup),
+    PushKind.IMAGE.name: lang.notificationImage(inGroup),
+    PushKind.AUDIO.name: lang.notificationAudio(inGroup),
+    PushKind.CONTACT_REQUEST.name: lang.notificationContactRequest,
+    PushKind.ACCEPT_REQUEST.name: lang.notificationAcceptRequest,
+    PushKind.STORED_MEDIA_FILE.name: lang.notificationStoredMediaFile,
+    PushKind.REACTION.name: lang.notificationReaction,
+    PushKind.REOPENED_MEDIA.name: lang.notificationReopenedMedia,
+    PushKind.REACTION_TO_VIDEO.name: lang.notificationReactionToVideo(
      pushNotification.additionalContent,
    ),
-    PushKind.reactionToAudio.name: lang.notificationReactionToAudio(
+    PushKind.REACTION_TO_AUDIO.name: lang.notificationReactionToAudio(
      pushNotification.additionalContent,
    ),
-    PushKind.reactionToText.name: lang.notificationReactionToText(
+    PushKind.REACTION_TO_TEXT.name: lang.notificationReactionToText(
      pushNotification.additionalContent,
    ),
-    PushKind.reactionToImage.name: lang.notificationReactionToImage(
+    PushKind.REACTION_TO_IMAGE.name: lang.notificationReactionToImage(
      pushNotification.additionalContent,
    ),
-    PushKind.response.name: lang.notificationResponse(inGroup),
-    PushKind.addedToGroup.name: lang.notificationAddedToGroup(
+    PushKind.RESPONSE.name: lang.notificationResponse(inGroup),
+    PushKind.ADDED_TO_GROUP.name: lang.notificationAddedToGroup(
      pushNotification.additionalContent,
    ),
  };
--- a/lib/src/services/notifications/pushkeys.notifications.dart
+++ b/lib/src/services/notifications/pushkeys.notifications.dart
@ -216,28 +216,28 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
      return null;
    }
    if (msg.content != null) {
-      kind = PushKind.reactionToText;
+      kind = PushKind.REACTION_TO_TEXT;
    } else if (msg.mediaId != null) {
      final media = await twonlyDB.mediaFilesDao.getMediaFileById(msg.mediaId!);
      if (media == null) return null;
      switch (media.type) {
        case MediaType.image:
-          kind = PushKind.reactionToImage;
+          kind = PushKind.REACTION_TO_IMAGE;
        case MediaType.audio:
-          kind = PushKind.reactionToAudio;
+          kind = PushKind.REACTION_TO_AUDIO;
        case MediaType.video:
-          kind = PushKind.reactionToVideo;
+          kind = PushKind.REACTION_TO_VIDEO;
        case MediaType.gif:
-          kind = PushKind.reaction;
+          kind = PushKind.REACTION;
      }
    }
    additionalContent = content.reaction.emoji;
  }

  if (content.hasTextMessage()) {
-    kind = PushKind.text;
+    kind = PushKind.TEXT;
    if (content.textMessage.hasQuoteMessageId()) {
-      kind = PushKind.response;
+      kind = PushKind.RESPONSE;
    }
    final group = await twonlyDB.groupsDao.getGroup(content.groupId);
    if (group != null && !group.isDirectChat) {
@ -246,7 +246,7 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
  }

  if (content.hasAdditionalDataMessage()) {
-    kind = PushKind.text;
+    kind = PushKind.TEXT;
  }

  if (content.hasMedia()) {
@ -254,16 +254,16 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
      case EncryptedContent_Media_Type.REUPLOAD:
        return null;
      case EncryptedContent_Media_Type.IMAGE:
-        kind = PushKind.image;
+        kind = PushKind.IMAGE;
      case EncryptedContent_Media_Type.VIDEO:
-        kind = PushKind.video;
+        kind = PushKind.VIDEO;
      case EncryptedContent_Media_Type.GIF:
-        kind = PushKind.image;
+        kind = PushKind.IMAGE;
      case EncryptedContent_Media_Type.AUDIO:
-        kind = PushKind.audio;
+        kind = PushKind.AUDIO;
    }
    if (content.media.requiresAuthentication) {
-      kind = PushKind.twonly;
+      kind = PushKind.TWONLY;
    }
    final group = await twonlyDB.groupsDao.getGroup(content.groupId);
    if (group != null && !group.isDirectChat) {
@ -274,9 +274,9 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
  if (content.hasContactRequest()) {
    switch (content.contactRequest.type) {
      case EncryptedContent_ContactRequest_Type.REQUEST:
-        kind = PushKind.contactRequest;
+        kind = PushKind.CONTACT_REQUEST;
      case EncryptedContent_ContactRequest_Type.ACCEPT:
-        kind = PushKind.acceptRequest;
+        kind = PushKind.ACCEPT_REQUEST;
      case EncryptedContent_ContactRequest_Type.REJECT:
        return null;
    }
@ -292,16 +292,16 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
    }
    switch (content.mediaUpdate.type) {
      case EncryptedContent_MediaUpdate_Type.REOPENED:
-        kind = PushKind.reopenedMedia;
+        kind = PushKind.REOPENED_MEDIA;
      case EncryptedContent_MediaUpdate_Type.STORED:
-        kind = PushKind.storedMediaFile;
+        kind = PushKind.STORED_MEDIA_FILE;
      case EncryptedContent_MediaUpdate_Type.DECRYPTION_ERROR:
        return null;
    }
  }

  if (content.hasGroupCreate()) {
-    kind = PushKind.addedToGroup;
+    kind = PushKind.ADDED_TO_GROUP;
    final group = await twonlyDB.groupsDao.getGroup(content.groupId);
    additionalContent = group!.groupName;
  }
@ -344,9 +344,9 @@ Future<Uint8List?> encryptPushNotification(
    // user does not have send any push keys
    // only allow accept request and contact request to be send in an insecure way :/
    // In future find a better way, e.g. use the signal protocol in a native way..
-    if (content.kind != PushKind.acceptRequest &&
-        content.kind != PushKind.contactRequest &&
-        content.kind != PushKind.testNotification) {
+    if (content.kind != PushKind.ACCEPT_REQUEST &&
+        content.kind != PushKind.CONTACT_REQUEST &&
+        content.kind != PushKind.TEST_NOTIFICATION) {
      // this will be enforced after every app uses this system... :/
      // return null;
      Log.warn('Using insecure key as the receiver does not send a push key!');
--- a/lib/src/utils/qr.dart
+++ b/lib/src/utils/qr.dart
@ -31,7 +31,7 @@ Future<Uint8List> getProfileQrCodeData() async {
  final data = publicProfile.writeToBuffer();

  final qrEnvelope = QREnvelope(
-    type: QREnvelope_Type.PublicProfile,
+    type: QREnvelope_Type.PUBLIC_PROFILE,
    data: data,
  );

@ -47,7 +47,7 @@ Future<Uint8List> getUserPublicKey() async {
 PublicProfile? parseQrCodeData(Uint8List rawBytes) {
  try {
    final envelop = QREnvelope.fromBuffer(rawBytes);
-    if (envelop.type == QREnvelope_Type.PublicProfile) {
+    if (envelop.type == QREnvelope_Type.PUBLIC_PROFILE) {
      return PublicProfile.fromBuffer(envelop.data);
    }
  } catch (e) {
--- a/lib/src/views/settings/notification.view.dart
+++ b/lib/src/views/settings/notification.view.dart
@ -61,7 +61,7 @@ class _NotificationViewState extends State<NotificationView> {
            user.userId,
            PushNotification(
              messageId: uuid.v4(),
-              kind: PushKind.testNotification,
+              kind: PushKind.TEST_NOTIFICATION,
            ),
          );
          await apiService.sendTextMessage(