add qr view #327

dependencies

@@ -1 +1 @@
-Subproject commit 3a2577878242feee5d5a50205498fce1c26f3202
+Subproject commit fb66274bf729cde6f7184ec6f7f9ea89f12450fd

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '15.0'
+platform :ios, '15.5'
 use_frameworks!
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.

ios/Podfile.lock

@@ -122,11 +122,16 @@ PODS:
     - FlutterMacOS
   - flutter_volume_controller (0.0.1):
     - Flutter
-  - flutter_zxing (0.0.1):
-    - Flutter
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
+  - google_mlkit_barcode_scanning (0.14.1):
+    - Flutter
+    - google_mlkit_commons
+    - GoogleMLKit/BarcodeScanning (~> 7.0.0)
+  - google_mlkit_commons (0.11.0):
+    - Flutter
+    - MLKitVision
   - GoogleAdsOnDeviceConversion (3.1.0):
     - GoogleUtilities/Environment (~> 8.1)
     - GoogleUtilities/Logger (~> 8.1)
@@ -157,6 +162,16 @@ PODS:
   - GoogleDataTransport (10.1.0):
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
+  - GoogleMLKit/BarcodeScanning (7.0.0):
+    - GoogleMLKit/MLKitCore
+    - MLKitBarcodeScanning (~> 6.0.0)
+  - GoogleMLKit/MLKitCore (7.0.0):
+    - MLKitCommon (~> 12.0.0)
+  - GoogleToolboxForMac/Defines (4.2.1)
+  - GoogleToolboxForMac/Logger (4.2.1):
+    - GoogleToolboxForMac/Defines (= 4.2.1)
+  - "GoogleToolboxForMac/NSData+zlib (4.2.1)":
+    - GoogleToolboxForMac/Defines (= 4.2.1)
   - GoogleUtilities (8.1.0):
     - GoogleUtilities/AppDelegateSwizzler (= 8.1.0)
     - GoogleUtilities/Environment (= 8.1.0)
@@ -197,6 +212,7 @@ PODS:
   - GoogleUtilities/UserDefaults (8.1.0):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
+  - GTMSessionFetcher/Core (3.5.0)
   - image_picker_ios (0.0.1):
     - Flutter
   - libwebp (1.5.0):
@@ -217,6 +233,23 @@ PODS:
   - Mantle (2.2.0):
     - Mantle/extobjc (= 2.2.0)
   - Mantle/extobjc (2.2.0)
+  - MLImage (1.0.0-beta6)
+  - MLKitBarcodeScanning (6.0.0):
+    - MLKitCommon (~> 12.0)
+    - MLKitVision (~> 8.0)
+  - MLKitCommon (12.0.0):
+    - GoogleDataTransport (~> 10.0)
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GoogleUtilities/Logger (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+  - MLKitVision (8.0.0):
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+    - MLImage (= 1.0.0-beta6)
+    - MLKitCommon (~> 12.0)
   - nanopb (3.30910.0):
     - nanopb/decode (= 3.30910.0)
     - nanopb/encode (= 3.30910.0)
@@ -312,8 +345,9 @@ DEPENDENCIES:
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
   - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`)
-  - flutter_zxing (from `.symlinks/plugins/flutter_zxing/ios`)
   - gal (from `.symlinks/plugins/gal/darwin`)
+  - google_mlkit_barcode_scanning (from `.symlinks/plugins/google_mlkit_barcode_scanning/ios`)
+  - google_mlkit_commons (from `.symlinks/plugins/google_mlkit_commons/ios`)
   - GoogleUtilities
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
@@ -345,9 +379,16 @@ SPEC REPOS:
     - GoogleAdsOnDeviceConversion
     - GoogleAppMeasurement
     - GoogleDataTransport
+    - GoogleMLKit
+    - GoogleToolboxForMac
     - GoogleUtilities
+    - GTMSessionFetcher
     - libwebp
     - Mantle
+    - MLImage
+    - MLKitBarcodeScanning
+    - MLKitCommon
+    - MLKitVision
     - nanopb
     - PromisesObjC
     - ScreenProtectorKit
@@ -393,10 +434,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin"
   flutter_volume_controller:
     :path: ".symlinks/plugins/flutter_volume_controller/ios"
-  flutter_zxing:
-    :path: ".symlinks/plugins/flutter_zxing/ios"
   gal:
     :path: ".symlinks/plugins/gal/darwin"
+  google_mlkit_barcode_scanning:
+    :path: ".symlinks/plugins/google_mlkit_barcode_scanning/ios"
+  google_mlkit_commons:
+    :path: ".symlinks/plugins/google_mlkit_commons/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   local_auth_darwin:
@@ -454,16 +497,24 @@ SPEC CHECKSUMS:
   flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
   flutter_secure_storage_darwin: ce237a8775b39723566dc72571190a3769d70468
   flutter_volume_controller: c2be490cb0487e8b88d0d9fc2b7e1c139a4ebccb
-  flutter_zxing: e8bcc43bd3056c70c271b732ed94e7a16fd62f93
   gal: baecd024ebfd13c441269ca7404792a7152fde89
+  google_mlkit_barcode_scanning: 8f5987f244a43fe1167689c548342a5174108159
+  google_mlkit_commons: 2abe6a70e1824e431d16a51085cb475b672c8aab
   GoogleAdsOnDeviceConversion: e03a386840803ea7eef3fd22a061930142c039c1
   GoogleAppMeasurement: 1e718274b7e015cefd846ac1fcf7820c70dc017d
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleMLKit: eff9e23ec1d90ea4157a1ee2e32a4f610c5b3318
+  GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
   image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
+  MLImage: 0ad1c5f50edd027672d8b26b0fee78a8b4a0fc56
+  MLKitBarcodeScanning: 0a3064da0a7f49ac24ceb3cb46a5bc67496facd2
+  MLKitCommon: 07c2c33ae5640e5380beaaa6e4b9c249a205542d
+  MLKitVision: 45e79d68845a2de77e2dd4d7f07947f0ed157b0e
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   no_screenshot: 6d183496405a3ab709a67a54e5cd0f639e94729e
   objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
@@ -487,6 +538,6 @@ SPEC CHECKSUMS:
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
   video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
 
-PODFILE CHECKSUM: 47470fbd5b59affa461eaf943ac57acce81e0ee8
+PODFILE CHECKSUM: c0c524475498435108850efecde62ba98e081c25
 
 COCOAPODS: 1.16.2

lib/src/model/protobuf/api/http/http_requests.pbenum.dart

@@ -1,11 +1,11 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/http/http_requests.proto.
-//  source: api/http/http_requests.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-
+// ignore_for_file: non_constant_identifier_names

lib/src/model/protobuf/api/http/http_requests.pbjson.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/http/http_requests.proto.
-//  source: api/http/http_requests.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -19,7 +20,15 @@ const TextMessage$json = {
   '2': [
     {'1': 'user_id', '3': 1, '4': 1, '5': 3, '10': 'userId'},
     {'1': 'body', '3': 2, '4': 1, '5': 12, '10': 'body'},
-    {'1': 'push_data', '3': 3, '4': 1, '5': 12, '9': 0, '10': 'pushData', '17': true},
+    {
+      '1': 'push_data',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '9': 0,
+      '10': 'pushData',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_push_data'},
@@ -37,7 +46,14 @@ const UploadRequest$json = {
   '2': [
     {'1': 'encrypted_data', '3': 1, '4': 1, '5': 12, '10': 'encryptedData'},
     {'1': 'download_tokens', '3': 2, '4': 3, '5': 12, '10': 'downloadTokens'},
-    {'1': 'messages_on_success', '3': 3, '4': 3, '5': 11, '6': '.http_requests.TextMessage', '10': 'messagesOnSuccess'},
+    {
+      '1': 'messages_on_success',
+      '3': 3,
+      '4': 3,
+      '5': 11,
+      '6': '.http_requests.TextMessage',
+      '10': 'messagesOnSuccess'
+    },
   ],
 };
 
@@ -52,7 +68,14 @@ final $typed_data.Uint8List uploadRequestDescriptor = $convert.base64Decode(
 const UpdateGroupState$json = {
   '1': 'UpdateGroupState',
   '2': [
-    {'1': 'update', '3': 1, '4': 1, '5': 11, '6': '.http_requests.UpdateGroupState.UpdateTBS', '10': 'update'},
+    {
+      '1': 'update',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.http_requests.UpdateGroupState.UpdateTBS',
+      '10': 'update'
+    },
     {'1': 'signature', '3': 2, '4': 1, '5': 12, '10': 'signature'},
   ],
   '3': [UpdateGroupState_UpdateTBS$json],
@@ -63,10 +86,32 @@ const UpdateGroupState_UpdateTBS$json = {
   '1': 'UpdateTBS',
   '2': [
     {'1': 'version_id', '3': 1, '4': 1, '5': 4, '10': 'versionId'},
-    {'1': 'encrypted_group_state', '3': 3, '4': 1, '5': 12, '10': 'encryptedGroupState'},
+    {
+      '1': 'encrypted_group_state',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '10': 'encryptedGroupState'
+    },
     {'1': 'public_key', '3': 4, '4': 1, '5': 12, '10': 'publicKey'},
-    {'1': 'remove_admin', '3': 5, '4': 1, '5': 12, '9': 0, '10': 'removeAdmin', '17': true},
+    {
-    {'1': 'add_admin', '3': 6, '4': 1, '5': 12, '9': 1, '10': 'addAdmin', '17': true},
+      '1': 'remove_admin',
+      '3': 5,
+      '4': 1,
+      '5': 12,
+      '9': 0,
+      '10': 'removeAdmin',
+      '17': true
+    },
+    {
+      '1': 'add_admin',
+      '3': 6,
+      '4': 1,
+      '5': 12,
+      '9': 1,
+      '10': 'addAdmin',
+      '17': true
+    },
     {'1': 'nonce', '3': 7, '4': 1, '5': 12, '10': 'nonce'},
   ],
   '8': [
@@ -91,7 +136,13 @@ const NewGroupState$json = {
   '2': [
     {'1': 'group_id', '3': 1, '4': 1, '5': 9, '10': 'groupId'},
     {'1': 'version_id', '3': 2, '4': 1, '5': 4, '10': 'versionId'},
-    {'1': 'encrypted_group_state', '3': 3, '4': 1, '5': 12, '10': 'encryptedGroupState'},
+    {
+      '1': 'encrypted_group_state',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '10': 'encryptedGroupState'
+    },
     {'1': 'public_key', '3': 4, '4': 1, '5': 12, '10': 'publicKey'},
   ],
 };
@@ -107,7 +158,14 @@ const AppendGroupState$json = {
   '1': 'AppendGroupState',
   '2': [
     {'1': 'signature', '3': 1, '4': 1, '5': 12, '10': 'signature'},
-    {'1': 'appendTBS', '3': 2, '4': 1, '5': 11, '6': '.http_requests.AppendGroupState.AppendTBS', '10': 'appendTBS'},
+    {
+      '1': 'appendTBS',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.http_requests.AppendGroupState.AppendTBS',
+      '10': 'appendTBS'
+    },
     {'1': 'versionId', '3': 3, '4': 1, '5': 4, '10': 'versionId'},
   ],
   '3': [AppendGroupState_AppendTBS$json],
@@ -117,7 +175,13 @@ const AppendGroupState$json = {
 const AppendGroupState_AppendTBS$json = {
   '1': 'AppendTBS',
   '2': [
-    {'1': 'encrypted_group_state_append', '3': 1, '4': 1, '5': 12, '10': 'encryptedGroupStateAppend'},
+    {
+      '1': 'encrypted_group_state_append',
+      '3': 1,
+      '4': 1,
+      '5': 12,
+      '10': 'encryptedGroupStateAppend'
+    },
     {'1': 'public_key', '3': 2, '4': 1, '5': 12, '10': 'publicKey'},
     {'1': 'group_id', '3': 3, '4': 1, '5': 9, '10': 'groupId'},
     {'1': 'nonce', '3': 4, '4': 1, '5': 12, '10': 'nonce'},
@@ -138,8 +202,21 @@ const GroupState$json = {
   '1': 'GroupState',
   '2': [
     {'1': 'version_id', '3': 1, '4': 1, '5': 4, '10': 'versionId'},
-    {'1': 'encrypted_group_state', '3': 2, '4': 1, '5': 12, '10': 'encryptedGroupState'},
+    {
-    {'1': 'appended_group_states', '3': 3, '4': 3, '5': 11, '6': '.http_requests.AppendGroupState', '10': 'appendedGroupStates'},
+      '1': 'encrypted_group_state',
+      '3': 2,
+      '4': 1,
+      '5': 12,
+      '10': 'encryptedGroupState'
+    },
+    {
+      '1': 'appended_group_states',
+      '3': 3,
+      '4': 3,
+      '5': 11,
+      '6': '.http_requests.AppendGroupState',
+      '10': 'appendedGroupStates'
+    },
   ],
 };
 
@@ -154,7 +231,14 @@ final $typed_data.Uint8List groupStateDescriptor = $convert.base64Decode(
 const AppendGroupStateHelper$json = {
   '1': 'AppendGroupStateHelper',
   '2': [
-    {'1': 'appended_group_states', '3': 1, '4': 3, '5': 11, '6': '.http_requests.AppendGroupState', '10': 'appendedGroupStates'},
+    {
+      '1': 'appended_group_states',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.http_requests.AppendGroupState',
+      '10': 'appendedGroupStates'
+    },
   ],
 };
 
@@ -162,4 +246,3 @@ const AppendGroupStateHelper$json = {
 final $typed_data.Uint8List appendGroupStateHelperDescriptor = $convert.base64Decode(
     'ChZBcHBlbmRHcm91cFN0YXRlSGVscGVyElMKFWFwcGVuZGVkX2dyb3VwX3N0YXRlcxgBIAMoCz'
     'IfLmh0dHBfcmVxdWVzdHMuQXBwZW5kR3JvdXBTdGF0ZVITYXBwZW5kZWRHcm91cFN0YXRlcw==');
-

lib/src/model/protobuf/api/websocket/client_to_server.pbenum.dart

@@ -1,11 +1,11 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/websocket/client_to_server.proto.
-//  source: api/websocket/client_to_server.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-
+// ignore_for_file: non_constant_identifier_names

lib/src/model/protobuf/api/websocket/client_to_server.pbjson.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/websocket/client_to_server.proto.
-//  source: api/websocket/client_to_server.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -17,7 +18,15 @@ import 'dart:typed_data' as $typed_data;
 const ClientToServer$json = {
   '1': 'ClientToServer',
   '2': [
-    {'1': 'V0', '3': 1, '4': 1, '5': 11, '6': '.client_to_server.V0', '9': 0, '10': 'V0'},
+    {
+      '1': 'V0',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.V0',
+      '9': 0,
+      '10': 'V0'
+    },
   ],
   '8': [
     {'1': 'v'},
@@ -34,9 +43,33 @@ const V0$json = {
   '1': 'V0',
   '2': [
     {'1': 'seq', '3': 1, '4': 1, '5': 4, '10': 'seq'},
-    {'1': 'handshake', '3': 2, '4': 1, '5': 11, '6': '.client_to_server.Handshake', '9': 0, '10': 'handshake'},
+    {
-    {'1': 'applicationdata', '3': 3, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData', '9': 0, '10': 'applicationdata'},
+      '1': 'handshake',
-    {'1': 'response', '3': 4, '4': 1, '5': 11, '6': '.client_to_server.Response', '9': 0, '10': 'response'},
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.Handshake',
+      '9': 0,
+      '10': 'handshake'
+    },
+    {
+      '1': 'applicationdata',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData',
+      '9': 0,
+      '10': 'applicationdata'
+    },
+    {
+      '1': 'response',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.Response',
+      '9': 0,
+      '10': 'response'
+    },
   ],
   '8': [
     {'1': 'Kind'},
@@ -55,13 +88,59 @@ final $typed_data.Uint8List v0Descriptor = $convert.base64Decode(
 const Handshake$json = {
   '1': 'Handshake',
   '2': [
-    {'1': 'register', '3': 1, '4': 1, '5': 11, '6': '.client_to_server.Handshake.Register', '9': 0, '10': 'register'},
+    {
-    {'1': 'getAuthChallenge', '3': 2, '4': 1, '5': 11, '6': '.client_to_server.Handshake.GetAuthChallenge', '9': 0, '10': 'getAuthChallenge'},
+      '1': 'register',
-    {'1': 'getAuthToken', '3': 3, '4': 1, '5': 11, '6': '.client_to_server.Handshake.GetAuthToken', '9': 0, '10': 'getAuthToken'},
+      '3': 1,
-    {'1': 'authenticate', '3': 4, '4': 1, '5': 11, '6': '.client_to_server.Handshake.Authenticate', '9': 0, '10': 'authenticate'},
+      '4': 1,
-    {'1': 'requestPOW', '3': 5, '4': 1, '5': 11, '6': '.client_to_server.Handshake.RequestPOW', '9': 0, '10': 'requestPOW'},
+      '5': 11,
+      '6': '.client_to_server.Handshake.Register',
+      '9': 0,
+      '10': 'register'
+    },
+    {
+      '1': 'getAuthChallenge',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.Handshake.GetAuthChallenge',
+      '9': 0,
+      '10': 'getAuthChallenge'
+    },
+    {
+      '1': 'getAuthToken',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.Handshake.GetAuthToken',
+      '9': 0,
+      '10': 'getAuthToken'
+    },
+    {
+      '1': 'authenticate',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.Handshake.Authenticate',
+      '9': 0,
+      '10': 'authenticate'
+    },
+    {
+      '1': 'requestPOW',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.Handshake.RequestPOW',
+      '9': 0,
+      '10': 'requestPOW'
+    },
+  ],
+  '3': [
+    Handshake_RequestPOW$json,
+    Handshake_Register$json,
+    Handshake_GetAuthChallenge$json,
+    Handshake_GetAuthToken$json,
+    Handshake_Authenticate$json
   ],
-  '3': [Handshake_RequestPOW$json, Handshake_Register$json, Handshake_GetAuthChallenge$json, Handshake_GetAuthToken$json, Handshake_Authenticate$json],
   '8': [
     {'1': 'Handshake'},
   ],
@@ -77,10 +156,30 @@ const Handshake_Register$json = {
   '1': 'Register',
   '2': [
     {'1': 'username', '3': 1, '4': 1, '5': 9, '10': 'username'},
-    {'1': 'invite_code', '3': 2, '4': 1, '5': 9, '9': 0, '10': 'inviteCode', '17': true},
+    {
-    {'1': 'public_identity_key', '3': 3, '4': 1, '5': 12, '10': 'publicIdentityKey'},
+      '1': 'invite_code',
+      '3': 2,
+      '4': 1,
+      '5': 9,
+      '9': 0,
+      '10': 'inviteCode',
+      '17': true
+    },
+    {
+      '1': 'public_identity_key',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '10': 'publicIdentityKey'
+    },
     {'1': 'signed_prekey', '3': 4, '4': 1, '5': 12, '10': 'signedPrekey'},
-    {'1': 'signed_prekey_signature', '3': 5, '4': 1, '5': 12, '10': 'signedPrekeySignature'},
+    {
+      '1': 'signed_prekey_signature',
+      '3': 5,
+      '4': 1,
+      '5': 12,
+      '10': 'signedPrekeySignature'
+    },
     {'1': 'signed_prekey_id', '3': 6, '4': 1, '5': 3, '10': 'signedPrekeyId'},
     {'1': 'registration_id', '3': 7, '4': 1, '5': 3, '10': 'registrationId'},
     {'1': 'is_ios', '3': 8, '4': 1, '5': 8, '10': 'isIos'},
@@ -112,8 +211,24 @@ const Handshake_Authenticate$json = {
   '2': [
     {'1': 'user_id', '3': 1, '4': 1, '5': 3, '10': 'userId'},
     {'1': 'auth_token', '3': 2, '4': 1, '5': 12, '10': 'authToken'},
-    {'1': 'app_version', '3': 3, '4': 1, '5': 9, '9': 0, '10': 'appVersion', '17': true},
+    {
-    {'1': 'device_id', '3': 4, '4': 1, '5': 3, '9': 1, '10': 'deviceId', '17': true},
+      '1': 'app_version',
+      '3': 3,
+      '4': 1,
+      '5': 9,
+      '9': 0,
+      '10': 'appVersion',
+      '17': true
+    },
+    {
+      '1': 'device_id',
+      '3': 4,
+      '4': 1,
+      '5': 3,
+      '9': 1,
+      '10': 'deviceId',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_app_version'},
@@ -148,30 +263,229 @@ final $typed_data.Uint8List handshakeDescriptor = $convert.base64Decode(
 const ApplicationData$json = {
   '1': 'ApplicationData',
   '2': [
-    {'1': 'textMessage', '3': 1, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.TextMessage', '9': 0, '10': 'textMessage'},
+    {
-    {'1': 'getUserByUsername', '3': 2, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetUserByUsername', '9': 0, '10': 'getUserByUsername'},
+      '1': 'textMessage',
-    {'1': 'getPrekeysByUserId', '3': 3, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetPrekeysByUserId', '9': 0, '10': 'getPrekeysByUserId'},
+      '3': 1,
-    {'1': 'getUserById', '3': 6, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetUserById', '9': 0, '10': 'getUserById'},
+      '4': 1,
-    {'1': 'updateGoogleFcmToken', '3': 8, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.UpdateGoogleFcmToken', '9': 0, '10': 'updateGoogleFcmToken'},
+      '5': 11,
-    {'1': 'getLocation', '3': 9, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetLocation', '9': 0, '10': 'getLocation'},
+      '6': '.client_to_server.ApplicationData.TextMessage',
-    {'1': 'getCurrentPlanInfos', '3': 10, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetCurrentPlanInfos', '9': 0, '10': 'getCurrentPlanInfos'},
+      '9': 0,
-    {'1': 'redeemVoucher', '3': 11, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.RedeemVoucher', '9': 0, '10': 'redeemVoucher'},
+      '10': 'textMessage'
-    {'1': 'getAvailablePlans', '3': 12, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetAvailablePlans', '9': 0, '10': 'getAvailablePlans'},
+    },
-    {'1': 'createVoucher', '3': 13, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.CreateVoucher', '9': 0, '10': 'createVoucher'},
+    {
-    {'1': 'getVouchers', '3': 14, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetVouchers', '9': 0, '10': 'getVouchers'},
+      '1': 'getUserByUsername',
-    {'1': 'switchtoPayedPlan', '3': 15, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.SwitchToPayedPlan', '9': 0, '10': 'switchtoPayedPlan'},
+      '3': 2,
-    {'1': 'getAddaccountsInvites', '3': 16, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetAddAccountsInvites', '9': 0, '10': 'getAddaccountsInvites'},
+      '4': 1,
-    {'1': 'redeemAdditionalCode', '3': 17, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.RedeemAdditionalCode', '9': 0, '10': 'redeemAdditionalCode'},
+      '5': 11,
-    {'1': 'removeAdditionalUser', '3': 18, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.RemoveAdditionalUser', '9': 0, '10': 'removeAdditionalUser'},
+      '6': '.client_to_server.ApplicationData.GetUserByUsername',
-    {'1': 'updatePlanOptions', '3': 19, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.UpdatePlanOptions', '9': 0, '10': 'updatePlanOptions'},
+      '9': 0,
-    {'1': 'downloadDone', '3': 20, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.DownloadDone', '9': 0, '10': 'downloadDone'},
+      '10': 'getUserByUsername'
-    {'1': 'getSignedPrekeyByUserid', '3': 22, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetSignedPreKeyByUserId', '9': 0, '10': 'getSignedPrekeyByUserid'},
+    },
-    {'1': 'updateSignedPrekey', '3': 23, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.UpdateSignedPreKey', '9': 0, '10': 'updateSignedPrekey'},
+    {
-    {'1': 'deleteAccount', '3': 24, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.DeleteAccount', '9': 0, '10': 'deleteAccount'},
+      '1': 'getPrekeysByUserId',
-    {'1': 'reportUser', '3': 25, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.ReportUser', '9': 0, '10': 'reportUser'},
+      '3': 3,
-    {'1': 'changeUsername', '3': 26, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.ChangeUsername', '9': 0, '10': 'changeUsername'},
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.GetPrekeysByUserId',
+      '9': 0,
+      '10': 'getPrekeysByUserId'
+    },
+    {
+      '1': 'getUserById',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.GetUserById',
+      '9': 0,
+      '10': 'getUserById'
+    },
+    {
+      '1': 'updateGoogleFcmToken',
+      '3': 8,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.UpdateGoogleFcmToken',
+      '9': 0,
+      '10': 'updateGoogleFcmToken'
+    },
+    {
+      '1': 'getLocation',
+      '3': 9,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.GetLocation',
+      '9': 0,
+      '10': 'getLocation'
+    },
+    {
+      '1': 'getCurrentPlanInfos',
+      '3': 10,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.GetCurrentPlanInfos',
+      '9': 0,
+      '10': 'getCurrentPlanInfos'
+    },
+    {
+      '1': 'redeemVoucher',
+      '3': 11,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.RedeemVoucher',
+      '9': 0,
+      '10': 'redeemVoucher'
+    },
+    {
+      '1': 'getAvailablePlans',
+      '3': 12,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.GetAvailablePlans',
+      '9': 0,
+      '10': 'getAvailablePlans'
+    },
+    {
+      '1': 'createVoucher',
+      '3': 13,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.CreateVoucher',
+      '9': 0,
+      '10': 'createVoucher'
+    },
+    {
+      '1': 'getVouchers',
+      '3': 14,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.GetVouchers',
+      '9': 0,
+      '10': 'getVouchers'
+    },
+    {
+      '1': 'switchtoPayedPlan',
+      '3': 15,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.SwitchToPayedPlan',
+      '9': 0,
+      '10': 'switchtoPayedPlan'
+    },
+    {
+      '1': 'getAddaccountsInvites',
+      '3': 16,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.GetAddAccountsInvites',
+      '9': 0,
+      '10': 'getAddaccountsInvites'
+    },
+    {
+      '1': 'redeemAdditionalCode',
+      '3': 17,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.RedeemAdditionalCode',
+      '9': 0,
+      '10': 'redeemAdditionalCode'
+    },
+    {
+      '1': 'removeAdditionalUser',
+      '3': 18,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.RemoveAdditionalUser',
+      '9': 0,
+      '10': 'removeAdditionalUser'
+    },
+    {
+      '1': 'updatePlanOptions',
+      '3': 19,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.UpdatePlanOptions',
+      '9': 0,
+      '10': 'updatePlanOptions'
+    },
+    {
+      '1': 'downloadDone',
+      '3': 20,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.DownloadDone',
+      '9': 0,
+      '10': 'downloadDone'
+    },
+    {
+      '1': 'getSignedPrekeyByUserid',
+      '3': 22,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.GetSignedPreKeyByUserId',
+      '9': 0,
+      '10': 'getSignedPrekeyByUserid'
+    },
+    {
+      '1': 'updateSignedPrekey',
+      '3': 23,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.UpdateSignedPreKey',
+      '9': 0,
+      '10': 'updateSignedPrekey'
+    },
+    {
+      '1': 'deleteAccount',
+      '3': 24,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.DeleteAccount',
+      '9': 0,
+      '10': 'deleteAccount'
+    },
+    {
+      '1': 'reportUser',
+      '3': 25,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.ReportUser',
+      '9': 0,
+      '10': 'reportUser'
+    },
+    {
+      '1': 'changeUsername',
+      '3': 26,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.ApplicationData.ChangeUsername',
+      '9': 0,
+      '10': 'changeUsername'
+    },
+  ],
+  '3': [
+    ApplicationData_TextMessage$json,
+    ApplicationData_GetUserByUsername$json,
+    ApplicationData_ChangeUsername$json,
+    ApplicationData_UpdateGoogleFcmToken$json,
+    ApplicationData_GetUserById$json,
+    ApplicationData_RedeemVoucher$json,
+    ApplicationData_SwitchToPayedPlan$json,
+    ApplicationData_UpdatePlanOptions$json,
+    ApplicationData_CreateVoucher$json,
+    ApplicationData_GetLocation$json,
+    ApplicationData_GetVouchers$json,
+    ApplicationData_GetAvailablePlans$json,
+    ApplicationData_GetAddAccountsInvites$json,
+    ApplicationData_GetCurrentPlanInfos$json,
+    ApplicationData_RedeemAdditionalCode$json,
+    ApplicationData_RemoveAdditionalUser$json,
+    ApplicationData_GetPrekeysByUserId$json,
+    ApplicationData_GetSignedPreKeyByUserId$json,
+    ApplicationData_UpdateSignedPreKey$json,
+    ApplicationData_DownloadDone$json,
+    ApplicationData_ReportUser$json,
+    ApplicationData_DeleteAccount$json
   ],
-  '3': [ApplicationData_TextMessage$json, ApplicationData_GetUserByUsername$json, ApplicationData_ChangeUsername$json, ApplicationData_UpdateGoogleFcmToken$json, ApplicationData_GetUserById$json, ApplicationData_RedeemVoucher$json, ApplicationData_SwitchToPayedPlan$json, ApplicationData_UpdatePlanOptions$json, ApplicationData_CreateVoucher$json, ApplicationData_GetLocation$json, ApplicationData_GetVouchers$json, ApplicationData_GetAvailablePlans$json, ApplicationData_GetAddAccountsInvites$json, ApplicationData_GetCurrentPlanInfos$json, ApplicationData_RedeemAdditionalCode$json, ApplicationData_RemoveAdditionalUser$json, ApplicationData_GetPrekeysByUserId$json, ApplicationData_GetSignedPreKeyByUserId$json, ApplicationData_UpdateSignedPreKey$json, ApplicationData_DownloadDone$json, ApplicationData_ReportUser$json, ApplicationData_DeleteAccount$json],
   '8': [
     {'1': 'ApplicationData'},
   ],
@@ -183,7 +497,15 @@ const ApplicationData_TextMessage$json = {
   '2': [
     {'1': 'user_id', '3': 1, '4': 1, '5': 3, '10': 'userId'},
     {'1': 'body', '3': 3, '4': 1, '5': 12, '10': 'body'},
-    {'1': 'push_data', '3': 4, '4': 1, '5': 12, '9': 0, '10': 'pushData', '17': true},
+    {
+      '1': 'push_data',
+      '3': 4,
+      '4': 1,
+      '5': 12,
+      '9': 0,
+      '10': 'pushData',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_push_data'},
@@ -319,7 +641,13 @@ const ApplicationData_UpdateSignedPreKey$json = {
   '2': [
     {'1': 'signed_prekey_id', '3': 1, '4': 1, '5': 3, '10': 'signedPrekeyId'},
     {'1': 'signed_prekey', '3': 2, '4': 1, '5': 12, '10': 'signedPrekey'},
-    {'1': 'signed_prekey_signature', '3': 3, '4': 1, '5': 12, '10': 'signedPrekeySignature'},
+    {
+      '1': 'signed_prekey_signature',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '10': 'signedPrekeySignature'
+    },
   ],
 };
 
@@ -413,8 +741,24 @@ final $typed_data.Uint8List applicationDataDescriptor = $convert.base64Decode(
 const Response$json = {
   '1': 'Response',
   '2': [
-    {'1': 'ok', '3': 1, '4': 1, '5': 11, '6': '.client_to_server.Response.Ok', '9': 0, '10': 'ok'},
+    {
-    {'1': 'error', '3': 2, '4': 1, '5': 14, '6': '.error.ErrorCode', '9': 0, '10': 'error'},
+      '1': 'ok',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.Response.Ok',
+      '9': 0,
+      '10': 'ok'
+    },
+    {
+      '1': 'error',
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.error.ErrorCode',
+      '9': 0,
+      '10': 'error'
+    },
   ],
   '3': [Response_PreKey$json, Response_Prekeys$json, Response_Ok$json],
   '8': [
@@ -435,7 +779,14 @@ const Response_PreKey$json = {
 const Response_Prekeys$json = {
   '1': 'Prekeys',
   '2': [
-    {'1': 'prekeys', '3': 1, '4': 3, '5': 11, '6': '.client_to_server.Response.PreKey', '10': 'prekeys'},
+    {
+      '1': 'prekeys',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.client_to_server.Response.PreKey',
+      '10': 'prekeys'
+    },
   ],
 };
 
@@ -444,7 +795,15 @@ const Response_Ok$json = {
   '1': 'Ok',
   '2': [
     {'1': 'None', '3': 1, '4': 1, '5': 8, '9': 0, '10': 'None'},
-    {'1': 'prekeys', '3': 2, '4': 1, '5': 11, '6': '.client_to_server.Response.Prekeys', '9': 0, '10': 'prekeys'},
+    {
+      '1': 'prekeys',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.client_to_server.Response.Prekeys',
+      '9': 0,
+      '10': 'prekeys'
+    },
   ],
   '8': [
     {'1': 'Ok'},
@@ -459,4 +818,3 @@ final $typed_data.Uint8List responseDescriptor = $convert.base64Decode(
     'ByZWtleXMYASADKAsyIS5jbGllbnRfdG9fc2VydmVyLlJlc3BvbnNlLlByZUtleVIHcHJla2V5'
     'cxpgCgJPaxIUCgROb25lGAEgASgISABSBE5vbmUSPgoHcHJla2V5cxgCIAEoCzIiLmNsaWVudF'
     '90b19zZXJ2ZXIuUmVzcG9uc2UuUHJla2V5c0gAUgdwcmVrZXlzQgQKAk9rQgoKCFJlc3BvbnNl');
-

lib/src/model/protobuf/api/websocket/error.pb.dart

@@ -1,15 +1,17 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/websocket/error.proto.
-//  source: api/websocket/error.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 import 'dart:core' as $core;
 
-export 'error.pbenum.dart';
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 
+export 'error.pbenum.dart';

lib/src/model/protobuf/api/websocket/error.pbenum.dart

@@ -1,57 +1,94 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/websocket/error.proto.
-//  source: api/websocket/error.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class ErrorCode extends $pb.ProtobufEnum {
-  static const ErrorCode Unknown = ErrorCode._(0, _omitEnumNames ? '' : 'Unknown');
+  static const ErrorCode Unknown =
-  static const ErrorCode BadRequest = ErrorCode._(400, _omitEnumNames ? '' : 'BadRequest');
+      ErrorCode._(0, _omitEnumNames ? '' : 'Unknown');
-  static const ErrorCode TooManyRequests = ErrorCode._(429, _omitEnumNames ? '' : 'TooManyRequests');
+  static const ErrorCode BadRequest =
-  static const ErrorCode InternalError = ErrorCode._(500, _omitEnumNames ? '' : 'InternalError');
+      ErrorCode._(400, _omitEnumNames ? '' : 'BadRequest');
-  static const ErrorCode InvalidInvitationCode = ErrorCode._(1002, _omitEnumNames ? '' : 'InvalidInvitationCode');
+  static const ErrorCode TooManyRequests =
-  static const ErrorCode UsernameAlreadyTaken = ErrorCode._(1003, _omitEnumNames ? '' : 'UsernameAlreadyTaken');
+      ErrorCode._(429, _omitEnumNames ? '' : 'TooManyRequests');
-  static const ErrorCode SignatureNotValid = ErrorCode._(1004, _omitEnumNames ? '' : 'SignatureNotValid');
+  static const ErrorCode InternalError =
-  static const ErrorCode UsernameNotFound = ErrorCode._(1005, _omitEnumNames ? '' : 'UsernameNotFound');
+      ErrorCode._(500, _omitEnumNames ? '' : 'InternalError');
-  static const ErrorCode UsernameNotValid = ErrorCode._(1006, _omitEnumNames ? '' : 'UsernameNotValid');
+  static const ErrorCode InvalidInvitationCode =
-  static const ErrorCode InvalidPublicKey = ErrorCode._(1007, _omitEnumNames ? '' : 'InvalidPublicKey');
+      ErrorCode._(1002, _omitEnumNames ? '' : 'InvalidInvitationCode');
-  static const ErrorCode SessionAlreadyAuthenticated = ErrorCode._(1008, _omitEnumNames ? '' : 'SessionAlreadyAuthenticated');
+  static const ErrorCode UsernameAlreadyTaken =
-  static const ErrorCode SessionNotAuthenticated = ErrorCode._(1009, _omitEnumNames ? '' : 'SessionNotAuthenticated');
+      ErrorCode._(1003, _omitEnumNames ? '' : 'UsernameAlreadyTaken');
-  static const ErrorCode OnlyOneSessionAllowed = ErrorCode._(1010, _omitEnumNames ? '' : 'OnlyOneSessionAllowed');
+  static const ErrorCode SignatureNotValid =
-  static const ErrorCode UploadLimitReached = ErrorCode._(1011, _omitEnumNames ? '' : 'UploadLimitReached');
+      ErrorCode._(1004, _omitEnumNames ? '' : 'SignatureNotValid');
-  static const ErrorCode InvalidUpdateToken = ErrorCode._(1012, _omitEnumNames ? '' : 'InvalidUpdateToken');
+  static const ErrorCode UsernameNotFound =
-  static const ErrorCode InvalidOffset = ErrorCode._(1013, _omitEnumNames ? '' : 'InvalidOffset');
+      ErrorCode._(1005, _omitEnumNames ? '' : 'UsernameNotFound');
-  static const ErrorCode InvalidGoogleFcmToken = ErrorCode._(1014, _omitEnumNames ? '' : 'InvalidGoogleFcmToken');
+  static const ErrorCode UsernameNotValid =
-  static const ErrorCode UploadTokenIsBlocked = ErrorCode._(1015, _omitEnumNames ? '' : 'UploadTokenIsBlocked');
+      ErrorCode._(1006, _omitEnumNames ? '' : 'UsernameNotValid');
-  static const ErrorCode UploadChecksumInvalid = ErrorCode._(1016, _omitEnumNames ? '' : 'UploadChecksumInvalid');
+  static const ErrorCode InvalidPublicKey =
-  static const ErrorCode InvalidDownloadToken = ErrorCode._(1017, _omitEnumNames ? '' : 'InvalidDownloadToken');
+      ErrorCode._(1007, _omitEnumNames ? '' : 'InvalidPublicKey');
-  static const ErrorCode ApiEndpointNotFound = ErrorCode._(1018, _omitEnumNames ? '' : 'ApiEndpointNotFound');
+  static const ErrorCode SessionAlreadyAuthenticated =
-  static const ErrorCode AuthTokenNotValid = ErrorCode._(1019, _omitEnumNames ? '' : 'AuthTokenNotValid');
+      ErrorCode._(1008, _omitEnumNames ? '' : 'SessionAlreadyAuthenticated');
-  static const ErrorCode InvalidPreKeys = ErrorCode._(1020, _omitEnumNames ? '' : 'InvalidPreKeys');
+  static const ErrorCode SessionNotAuthenticated =
-  static const ErrorCode VoucherInValid = ErrorCode._(1021, _omitEnumNames ? '' : 'VoucherInValid');
+      ErrorCode._(1009, _omitEnumNames ? '' : 'SessionNotAuthenticated');
-  static const ErrorCode PlanNotAllowed = ErrorCode._(1022, _omitEnumNames ? '' : 'PlanNotAllowed');
+  static const ErrorCode OnlyOneSessionAllowed =
-  static const ErrorCode PlanLimitReached = ErrorCode._(1023, _omitEnumNames ? '' : 'PlanLimitReached');
+      ErrorCode._(1010, _omitEnumNames ? '' : 'OnlyOneSessionAllowed');
-  static const ErrorCode NotEnoughCredit = ErrorCode._(1024, _omitEnumNames ? '' : 'NotEnoughCredit');
+  static const ErrorCode UploadLimitReached =
-  static const ErrorCode PlanDowngrade = ErrorCode._(1025, _omitEnumNames ? '' : 'PlanDowngrade');
+      ErrorCode._(1011, _omitEnumNames ? '' : 'UploadLimitReached');
-  static const ErrorCode PlanUpgradeNotYearly = ErrorCode._(1026, _omitEnumNames ? '' : 'PlanUpgradeNotYearly');
+  static const ErrorCode InvalidUpdateToken =
-  static const ErrorCode InvalidSignedPreKey = ErrorCode._(1027, _omitEnumNames ? '' : 'InvalidSignedPreKey');
+      ErrorCode._(1012, _omitEnumNames ? '' : 'InvalidUpdateToken');
-  static const ErrorCode UserIdNotFound = ErrorCode._(1028, _omitEnumNames ? '' : 'UserIdNotFound');
+  static const ErrorCode InvalidOffset =
-  static const ErrorCode UserIdAlreadyTaken = ErrorCode._(1029, _omitEnumNames ? '' : 'UserIdAlreadyTaken');
+      ErrorCode._(1013, _omitEnumNames ? '' : 'InvalidOffset');
-  static const ErrorCode AppVersionOutdated = ErrorCode._(1030, _omitEnumNames ? '' : 'AppVersionOutdated');
+  static const ErrorCode InvalidGoogleFcmToken =
-  static const ErrorCode NewDeviceRegistered = ErrorCode._(1031, _omitEnumNames ? '' : 'NewDeviceRegistered');
+      ErrorCode._(1014, _omitEnumNames ? '' : 'InvalidGoogleFcmToken');
-  static const ErrorCode InvalidProofOfWork = ErrorCode._(1032, _omitEnumNames ? '' : 'InvalidProofOfWork');
+  static const ErrorCode UploadTokenIsBlocked =
-  static const ErrorCode RegistrationDisabled = ErrorCode._(1033, _omitEnumNames ? '' : 'RegistrationDisabled');
+      ErrorCode._(1015, _omitEnumNames ? '' : 'UploadTokenIsBlocked');
+  static const ErrorCode UploadChecksumInvalid =
+      ErrorCode._(1016, _omitEnumNames ? '' : 'UploadChecksumInvalid');
+  static const ErrorCode InvalidDownloadToken =
+      ErrorCode._(1017, _omitEnumNames ? '' : 'InvalidDownloadToken');
+  static const ErrorCode ApiEndpointNotFound =
+      ErrorCode._(1018, _omitEnumNames ? '' : 'ApiEndpointNotFound');
+  static const ErrorCode AuthTokenNotValid =
+      ErrorCode._(1019, _omitEnumNames ? '' : 'AuthTokenNotValid');
+  static const ErrorCode InvalidPreKeys =
+      ErrorCode._(1020, _omitEnumNames ? '' : 'InvalidPreKeys');
+  static const ErrorCode VoucherInValid =
+      ErrorCode._(1021, _omitEnumNames ? '' : 'VoucherInValid');
+  static const ErrorCode PlanNotAllowed =
+      ErrorCode._(1022, _omitEnumNames ? '' : 'PlanNotAllowed');
+  static const ErrorCode PlanLimitReached =
+      ErrorCode._(1023, _omitEnumNames ? '' : 'PlanLimitReached');
+  static const ErrorCode NotEnoughCredit =
+      ErrorCode._(1024, _omitEnumNames ? '' : 'NotEnoughCredit');
+  static const ErrorCode PlanDowngrade =
+      ErrorCode._(1025, _omitEnumNames ? '' : 'PlanDowngrade');
+  static const ErrorCode PlanUpgradeNotYearly =
+      ErrorCode._(1026, _omitEnumNames ? '' : 'PlanUpgradeNotYearly');
+  static const ErrorCode InvalidSignedPreKey =
+      ErrorCode._(1027, _omitEnumNames ? '' : 'InvalidSignedPreKey');
+  static const ErrorCode UserIdNotFound =
+      ErrorCode._(1028, _omitEnumNames ? '' : 'UserIdNotFound');
+  static const ErrorCode UserIdAlreadyTaken =
+      ErrorCode._(1029, _omitEnumNames ? '' : 'UserIdAlreadyTaken');
+  static const ErrorCode AppVersionOutdated =
+      ErrorCode._(1030, _omitEnumNames ? '' : 'AppVersionOutdated');
+  static const ErrorCode NewDeviceRegistered =
+      ErrorCode._(1031, _omitEnumNames ? '' : 'NewDeviceRegistered');
+  static const ErrorCode InvalidProofOfWork =
+      ErrorCode._(1032, _omitEnumNames ? '' : 'InvalidProofOfWork');
+  static const ErrorCode RegistrationDisabled =
+      ErrorCode._(1033, _omitEnumNames ? '' : 'RegistrationDisabled');
 
-  static const $core.List<ErrorCode> values = <ErrorCode> [
+  static const $core.List<ErrorCode> values = <ErrorCode>[
     Unknown,
     BadRequest,
     TooManyRequests,
@@ -90,11 +127,12 @@ class ErrorCode extends $pb.ProtobufEnum {
     RegistrationDisabled,
   ];
 
-  static final $core.Map<$core.int, ErrorCode> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.Map<$core.int, ErrorCode> _byValue =
+      $pb.ProtobufEnum.initByValue(values);
   static ErrorCode? valueOf($core.int value) => _byValue[value];
 
-  const ErrorCode._($core.int v, $core.String n) : super(v, n);
+  const ErrorCode._(super.value, super.name);
 }
 
-
+const $core.bool _omitEnumNames =
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+    $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/src/model/protobuf/api/websocket/error.pbjson.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/websocket/error.proto.
-//  source: api/websocket/error.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -74,4 +75,3 @@ final $typed_data.Uint8List errorCodeDescriptor = $convert.base64Decode(
     'duZWRQcmVLZXkQgwgSEwoOVXNlcklkTm90Rm91bmQQhAgSFwoSVXNlcklkQWxyZWFkeVRha2Vu'
     'EIUIEhcKEkFwcFZlcnNpb25PdXRkYXRlZBCGCBIYChNOZXdEZXZpY2VSZWdpc3RlcmVkEIcIEh'
     'cKEkludmFsaWRQcm9vZk9mV29yaxCICBIZChRSZWdpc3RyYXRpb25EaXNhYmxlZBCJCA==');
-

lib/src/model/protobuf/api/websocket/server_to_client.pbenum.dart

@@ -1,29 +1,39 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/websocket/server_to_client.proto.
-//  source: api/websocket/server_to_client.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class Response_TransactionTypes extends $pb.ProtobufEnum {
-  static const Response_TransactionTypes Refund = Response_TransactionTypes._(0, _omitEnumNames ? '' : 'Refund');
+  static const Response_TransactionTypes Refund =
-  static const Response_TransactionTypes VoucherRedeemed = Response_TransactionTypes._(1, _omitEnumNames ? '' : 'VoucherRedeemed');
+      Response_TransactionTypes._(0, _omitEnumNames ? '' : 'Refund');
-  static const Response_TransactionTypes VoucherCreated = Response_TransactionTypes._(2, _omitEnumNames ? '' : 'VoucherCreated');
+  static const Response_TransactionTypes VoucherRedeemed =
-  static const Response_TransactionTypes Cash = Response_TransactionTypes._(3, _omitEnumNames ? '' : 'Cash');
+      Response_TransactionTypes._(1, _omitEnumNames ? '' : 'VoucherRedeemed');
-  static const Response_TransactionTypes PlanUpgrade = Response_TransactionTypes._(4, _omitEnumNames ? '' : 'PlanUpgrade');
+  static const Response_TransactionTypes VoucherCreated =
-  static const Response_TransactionTypes Unknown = Response_TransactionTypes._(5, _omitEnumNames ? '' : 'Unknown');
+      Response_TransactionTypes._(2, _omitEnumNames ? '' : 'VoucherCreated');
-  static const Response_TransactionTypes ThanksForTesting = Response_TransactionTypes._(6, _omitEnumNames ? '' : 'ThanksForTesting');
+  static const Response_TransactionTypes Cash =
-  static const Response_TransactionTypes AutoRenewal = Response_TransactionTypes._(7, _omitEnumNames ? '' : 'AutoRenewal');
+      Response_TransactionTypes._(3, _omitEnumNames ? '' : 'Cash');
+  static const Response_TransactionTypes PlanUpgrade =
+      Response_TransactionTypes._(4, _omitEnumNames ? '' : 'PlanUpgrade');
+  static const Response_TransactionTypes Unknown =
+      Response_TransactionTypes._(5, _omitEnumNames ? '' : 'Unknown');
+  static const Response_TransactionTypes ThanksForTesting =
+      Response_TransactionTypes._(6, _omitEnumNames ? '' : 'ThanksForTesting');
+  static const Response_TransactionTypes AutoRenewal =
+      Response_TransactionTypes._(7, _omitEnumNames ? '' : 'AutoRenewal');
 
-  static const $core.List<Response_TransactionTypes> values = <Response_TransactionTypes> [
+  static const $core.List<Response_TransactionTypes> values =
+      <Response_TransactionTypes>[
     Refund,
     VoucherRedeemed,
     VoucherCreated,
@@ -34,11 +44,13 @@ class Response_TransactionTypes extends $pb.ProtobufEnum {
     AutoRenewal,
   ];
 
-  static final $core.Map<$core.int, Response_TransactionTypes> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<Response_TransactionTypes?> _byValue =
-  static Response_TransactionTypes? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 7);
+  static Response_TransactionTypes? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const Response_TransactionTypes._($core.int v, $core.String n) : super(v, n);
+  const Response_TransactionTypes._(super.value, super.name);
 }
 
-
+const $core.bool _omitEnumNames =
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+    $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/src/model/protobuf/api/websocket/server_to_client.pbjson.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from api/websocket/server_to_client.proto.
-//  source: api/websocket/server_to_client.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -17,7 +18,15 @@ import 'dart:typed_data' as $typed_data;
 const ServerToClient$json = {
   '1': 'ServerToClient',
   '2': [
-    {'1': 'V0', '3': 1, '4': 1, '5': 11, '6': '.server_to_client.V0', '9': 0, '10': 'V0'},
+    {
+      '1': 'V0',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.V0',
+      '9': 0,
+      '10': 'V0'
+    },
   ],
   '8': [
     {'1': 'v'},
@@ -34,10 +43,41 @@ const V0$json = {
   '1': 'V0',
   '2': [
     {'1': 'seq', '3': 1, '4': 1, '5': 4, '10': 'seq'},
-    {'1': 'response', '3': 2, '4': 1, '5': 11, '6': '.server_to_client.Response', '9': 0, '10': 'response'},
+    {
-    {'1': 'newMessage', '3': 3, '4': 1, '5': 11, '6': '.server_to_client.NewMessage', '9': 0, '10': 'newMessage'},
+      '1': 'response',
-    {'1': 'RequestNewPreKeys', '3': 4, '4': 1, '5': 8, '9': 0, '10': 'RequestNewPreKeys'},
+      '3': 2,
-    {'1': 'error', '3': 6, '4': 1, '5': 14, '6': '.error.ErrorCode', '9': 0, '10': 'error'},
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response',
+      '9': 0,
+      '10': 'response'
+    },
+    {
+      '1': 'newMessage',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.NewMessage',
+      '9': 0,
+      '10': 'newMessage'
+    },
+    {
+      '1': 'RequestNewPreKeys',
+      '3': 4,
+      '4': 1,
+      '5': 8,
+      '9': 0,
+      '10': 'RequestNewPreKeys'
+    },
+    {
+      '1': 'error',
+      '3': 6,
+      '4': 1,
+      '5': 14,
+      '6': '.error.ErrorCode',
+      '9': 0,
+      '10': 'error'
+    },
   ],
   '8': [
     {'1': 'Kind'},
@@ -70,10 +110,45 @@ final $typed_data.Uint8List newMessageDescriptor = $convert.base64Decode(
 const Response$json = {
   '1': 'Response',
   '2': [
-    {'1': 'ok', '3': 1, '4': 1, '5': 11, '6': '.server_to_client.Response.Ok', '9': 0, '10': 'ok'},
+    {
-    {'1': 'error', '3': 2, '4': 1, '5': 14, '6': '.error.ErrorCode', '9': 0, '10': 'error'},
+      '1': 'ok',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.Ok',
+      '9': 0,
+      '10': 'ok'
+    },
+    {
+      '1': 'error',
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.error.ErrorCode',
+      '9': 0,
+      '10': 'error'
+    },
+  ],
+  '3': [
+    Response_Authenticated$json,
+    Response_Plan$json,
+    Response_Plans$json,
+    Response_AddAccountsInvite$json,
+    Response_AddAccountsInvites$json,
+    Response_Transaction$json,
+    Response_AdditionalAccount$json,
+    Response_Voucher$json,
+    Response_Vouchers$json,
+    Response_PlanBallance$json,
+    Response_Location$json,
+    Response_PreKey$json,
+    Response_SignedPreKey$json,
+    Response_UserData$json,
+    Response_UploadToken$json,
+    Response_DownloadTokens$json,
+    Response_ProofOfWork$json,
+    Response_Ok$json
   ],
-  '3': [Response_Authenticated$json, Response_Plan$json, Response_Plans$json, Response_AddAccountsInvite$json, Response_AddAccountsInvites$json, Response_Transaction$json, Response_AdditionalAccount$json, Response_Voucher$json, Response_Vouchers$json, Response_PlanBallance$json, Response_Location$json, Response_PreKey$json, Response_SignedPreKey$json, Response_UserData$json, Response_UploadToken$json, Response_DownloadTokens$json, Response_ProofOfWork$json, Response_Ok$json],
   '4': [Response_TransactionTypes$json],
   '8': [
     {'1': 'Response'},
@@ -94,14 +169,56 @@ const Response_Plan$json = {
   '2': [
     {'1': 'plan_id', '3': 1, '4': 1, '5': 9, '10': 'planId'},
     {'1': 'upload_size_limit', '3': 2, '4': 1, '5': 3, '10': 'uploadSizeLimit'},
-    {'1': 'daily_media_upload_limit', '3': 3, '4': 1, '5': 3, '10': 'dailyMediaUploadLimit'},
+    {
-    {'1': 'maximal_upload_size_of_single_media_size', '3': 4, '4': 1, '5': 3, '10': 'maximalUploadSizeOfSingleMediaSize'},
+      '1': 'daily_media_upload_limit',
-    {'1': 'additional_plus_accounts', '3': 5, '4': 1, '5': 3, '10': 'additionalPlusAccounts'},
+      '3': 3,
-    {'1': 'additional_free_accounts', '3': 6, '4': 1, '5': 3, '10': 'additionalFreeAccounts'},
+      '4': 1,
-    {'1': 'monthly_costs_cent', '3': 7, '4': 1, '5': 3, '10': 'monthlyCostsCent'},
+      '5': 3,
+      '10': 'dailyMediaUploadLimit'
+    },
+    {
+      '1': 'maximal_upload_size_of_single_media_size',
+      '3': 4,
+      '4': 1,
+      '5': 3,
+      '10': 'maximalUploadSizeOfSingleMediaSize'
+    },
+    {
+      '1': 'additional_plus_accounts',
+      '3': 5,
+      '4': 1,
+      '5': 3,
+      '10': 'additionalPlusAccounts'
+    },
+    {
+      '1': 'additional_free_accounts',
+      '3': 6,
+      '4': 1,
+      '5': 3,
+      '10': 'additionalFreeAccounts'
+    },
+    {
+      '1': 'monthly_costs_cent',
+      '3': 7,
+      '4': 1,
+      '5': 3,
+      '10': 'monthlyCostsCent'
+    },
     {'1': 'yearly_costs_cent', '3': 8, '4': 1, '5': 3, '10': 'yearlyCostsCent'},
-    {'1': 'allowed_to_send_text_messages', '3': 9, '4': 1, '5': 8, '10': 'allowedToSendTextMessages'},
+    {
-    {'1': 'is_additional_account', '3': 10, '4': 1, '5': 8, '10': 'isAdditionalAccount'},
+      '1': 'allowed_to_send_text_messages',
+      '3': 9,
+      '4': 1,
+      '5': 8,
+      '10': 'allowedToSendTextMessages'
+    },
+    {
+      '1': 'is_additional_account',
+      '3': 10,
+      '4': 1,
+      '5': 8,
+      '10': 'isAdditionalAccount'
+    },
   ],
 };
 
@@ -109,7 +226,14 @@ const Response_Plan$json = {
 const Response_Plans$json = {
   '1': 'Plans',
   '2': [
-    {'1': 'plans', '3': 1, '4': 3, '5': 11, '6': '.server_to_client.Response.Plan', '10': 'plans'},
+    {
+      '1': 'plans',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.server_to_client.Response.Plan',
+      '10': 'plans'
+    },
   ],
 };
 
@@ -126,7 +250,14 @@ const Response_AddAccountsInvite$json = {
 const Response_AddAccountsInvites$json = {
   '1': 'AddAccountsInvites',
   '2': [
-    {'1': 'invites', '3': 1, '4': 3, '5': 11, '6': '.server_to_client.Response.AddAccountsInvite', '10': 'invites'},
+    {
+      '1': 'invites',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.server_to_client.Response.AddAccountsInvite',
+      '10': 'invites'
+    },
   ],
 };
 
@@ -135,8 +266,21 @@ const Response_Transaction$json = {
   '1': 'Transaction',
   '2': [
     {'1': 'deposit_cents', '3': 1, '4': 1, '5': 3, '10': 'depositCents'},
-    {'1': 'transaction_type', '3': 2, '4': 1, '5': 14, '6': '.server_to_client.Response.TransactionTypes', '10': 'transactionType'},
+    {
-    {'1': 'created_at_unix_timestamp', '3': 3, '4': 1, '5': 3, '10': 'createdAtUnixTimestamp'},
+      '1': 'transaction_type',
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.server_to_client.Response.TransactionTypes',
+      '10': 'transactionType'
+    },
+    {
+      '1': 'created_at_unix_timestamp',
+      '3': 3,
+      '4': 1,
+      '5': 3,
+      '10': 'createdAtUnixTimestamp'
+    },
   ],
 };
 
@@ -157,7 +301,13 @@ const Response_Voucher$json = {
     {'1': 'value_cents', '3': 2, '4': 1, '5': 3, '10': 'valueCents'},
     {'1': 'redeemed', '3': 3, '4': 1, '5': 8, '10': 'redeemed'},
     {'1': 'requested', '3': 4, '4': 1, '5': 8, '10': 'requested'},
-    {'1': 'created_at_unix_timestamp', '3': 5, '4': 1, '5': 3, '10': 'createdAtUnixTimestamp'},
+    {
+      '1': 'created_at_unix_timestamp',
+      '3': 5,
+      '4': 1,
+      '5': 3,
+      '10': 'createdAtUnixTimestamp'
+    },
   ],
 };
 
@@ -165,7 +315,14 @@ const Response_Voucher$json = {
 const Response_Vouchers$json = {
   '1': 'Vouchers',
   '2': [
-    {'1': 'vouchers', '3': 1, '4': 3, '5': 11, '6': '.server_to_client.Response.Voucher', '10': 'vouchers'},
+    {
+      '1': 'vouchers',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.server_to_client.Response.Voucher',
+      '10': 'vouchers'
+    },
   ],
 };
 
@@ -173,14 +330,72 @@ const Response_Vouchers$json = {
 const Response_PlanBallance$json = {
   '1': 'PlanBallance',
   '2': [
-    {'1': 'used_daily_media_upload_limit', '3': 1, '4': 1, '5': 3, '10': 'usedDailyMediaUploadLimit'},
+    {
-    {'1': 'used_upload_media_size_limit', '3': 2, '4': 1, '5': 3, '10': 'usedUploadMediaSizeLimit'},
+      '1': 'used_daily_media_upload_limit',
-    {'1': 'payment_period_days', '3': 3, '4': 1, '5': 3, '9': 0, '10': 'paymentPeriodDays', '17': true},
+      '3': 1,
-    {'1': 'last_payment_done_unix_timestamp', '3': 4, '4': 1, '5': 3, '9': 1, '10': 'lastPaymentDoneUnixTimestamp', '17': true},
+      '4': 1,
-    {'1': 'transactions', '3': 5, '4': 3, '5': 11, '6': '.server_to_client.Response.Transaction', '10': 'transactions'},
+      '5': 3,
-    {'1': 'additional_accounts', '3': 6, '4': 3, '5': 11, '6': '.server_to_client.Response.AdditionalAccount', '10': 'additionalAccounts'},
+      '10': 'usedDailyMediaUploadLimit'
-    {'1': 'auto_renewal', '3': 7, '4': 1, '5': 8, '9': 2, '10': 'autoRenewal', '17': true},
+    },
-    {'1': 'additional_account_owner_id', '3': 8, '4': 1, '5': 3, '9': 3, '10': 'additionalAccountOwnerId', '17': true},
+    {
+      '1': 'used_upload_media_size_limit',
+      '3': 2,
+      '4': 1,
+      '5': 3,
+      '10': 'usedUploadMediaSizeLimit'
+    },
+    {
+      '1': 'payment_period_days',
+      '3': 3,
+      '4': 1,
+      '5': 3,
+      '9': 0,
+      '10': 'paymentPeriodDays',
+      '17': true
+    },
+    {
+      '1': 'last_payment_done_unix_timestamp',
+      '3': 4,
+      '4': 1,
+      '5': 3,
+      '9': 1,
+      '10': 'lastPaymentDoneUnixTimestamp',
+      '17': true
+    },
+    {
+      '1': 'transactions',
+      '3': 5,
+      '4': 3,
+      '5': 11,
+      '6': '.server_to_client.Response.Transaction',
+      '10': 'transactions'
+    },
+    {
+      '1': 'additional_accounts',
+      '3': 6,
+      '4': 3,
+      '5': 11,
+      '6': '.server_to_client.Response.AdditionalAccount',
+      '10': 'additionalAccounts'
+    },
+    {
+      '1': 'auto_renewal',
+      '3': 7,
+      '4': 1,
+      '5': 8,
+      '9': 2,
+      '10': 'autoRenewal',
+      '17': true
+    },
+    {
+      '1': 'additional_account_owner_id',
+      '3': 8,
+      '4': 1,
+      '5': 3,
+      '9': 3,
+      '10': 'additionalAccountOwnerId',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_payment_period_days'},
@@ -215,7 +430,13 @@ const Response_SignedPreKey$json = {
   '2': [
     {'1': 'signed_prekey_id', '3': 1, '4': 1, '5': 3, '10': 'signedPrekeyId'},
     {'1': 'signed_prekey', '3': 2, '4': 1, '5': 12, '10': 'signedPrekey'},
-    {'1': 'signed_prekey_signature', '3': 3, '4': 1, '5': 12, '10': 'signedPrekeySignature'},
+    {
+      '1': 'signed_prekey_signature',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '10': 'signedPrekeySignature'
+    },
   ],
 };
 
@@ -224,12 +445,59 @@ const Response_UserData$json = {
   '1': 'UserData',
   '2': [
     {'1': 'user_id', '3': 1, '4': 1, '5': 3, '10': 'userId'},
-    {'1': 'prekeys', '3': 2, '4': 3, '5': 11, '6': '.server_to_client.Response.PreKey', '10': 'prekeys'},
+    {
-    {'1': 'username', '3': 7, '4': 1, '5': 12, '9': 0, '10': 'username', '17': true},
+      '1': 'prekeys',
-    {'1': 'public_identity_key', '3': 3, '4': 1, '5': 12, '9': 1, '10': 'publicIdentityKey', '17': true},
+      '3': 2,
-    {'1': 'signed_prekey', '3': 4, '4': 1, '5': 12, '9': 2, '10': 'signedPrekey', '17': true},
+      '4': 3,
-    {'1': 'signed_prekey_signature', '3': 5, '4': 1, '5': 12, '9': 3, '10': 'signedPrekeySignature', '17': true},
+      '5': 11,
-    {'1': 'signed_prekey_id', '3': 6, '4': 1, '5': 3, '9': 4, '10': 'signedPrekeyId', '17': true},
+      '6': '.server_to_client.Response.PreKey',
+      '10': 'prekeys'
+    },
+    {
+      '1': 'username',
+      '3': 7,
+      '4': 1,
+      '5': 12,
+      '9': 0,
+      '10': 'username',
+      '17': true
+    },
+    {
+      '1': 'public_identity_key',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '9': 1,
+      '10': 'publicIdentityKey',
+      '17': true
+    },
+    {
+      '1': 'signed_prekey',
+      '3': 4,
+      '4': 1,
+      '5': 12,
+      '9': 2,
+      '10': 'signedPrekey',
+      '17': true
+    },
+    {
+      '1': 'signed_prekey_signature',
+      '3': 5,
+      '4': 1,
+      '5': 12,
+      '9': 3,
+      '10': 'signedPrekeySignature',
+      '17': true
+    },
+    {
+      '1': 'signed_prekey_id',
+      '3': 6,
+      '4': 1,
+      '5': 3,
+      '9': 4,
+      '10': 'signedPrekeyId',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_username'},
@@ -272,19 +540,114 @@ const Response_Ok$json = {
   '2': [
     {'1': 'None', '3': 1, '4': 1, '5': 8, '9': 0, '10': 'None'},
     {'1': 'userid', '3': 2, '4': 1, '5': 3, '9': 0, '10': 'userid'},
-    {'1': 'authchallenge', '3': 3, '4': 1, '5': 12, '9': 0, '10': 'authchallenge'},
+    {
-    {'1': 'uploadtoken', '3': 4, '4': 1, '5': 11, '6': '.server_to_client.Response.UploadToken', '9': 0, '10': 'uploadtoken'},
+      '1': 'authchallenge',
-    {'1': 'userdata', '3': 5, '4': 1, '5': 11, '6': '.server_to_client.Response.UserData', '9': 0, '10': 'userdata'},
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '9': 0,
+      '10': 'authchallenge'
+    },
+    {
+      '1': 'uploadtoken',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.UploadToken',
+      '9': 0,
+      '10': 'uploadtoken'
+    },
+    {
+      '1': 'userdata',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.UserData',
+      '9': 0,
+      '10': 'userdata'
+    },
     {'1': 'authtoken', '3': 6, '4': 1, '5': 12, '9': 0, '10': 'authtoken'},
-    {'1': 'location', '3': 7, '4': 1, '5': 11, '6': '.server_to_client.Response.Location', '9': 0, '10': 'location'},
+    {
-    {'1': 'authenticated', '3': 8, '4': 1, '5': 11, '6': '.server_to_client.Response.Authenticated', '9': 0, '10': 'authenticated'},
+      '1': 'location',
-    {'1': 'plans', '3': 9, '4': 1, '5': 11, '6': '.server_to_client.Response.Plans', '9': 0, '10': 'plans'},
+      '3': 7,
-    {'1': 'planballance', '3': 10, '4': 1, '5': 11, '6': '.server_to_client.Response.PlanBallance', '9': 0, '10': 'planballance'},
+      '4': 1,
-    {'1': 'vouchers', '3': 11, '4': 1, '5': 11, '6': '.server_to_client.Response.Vouchers', '9': 0, '10': 'vouchers'},
+      '5': 11,
-    {'1': 'addaccountsinvites', '3': 12, '4': 1, '5': 11, '6': '.server_to_client.Response.AddAccountsInvites', '9': 0, '10': 'addaccountsinvites'},
+      '6': '.server_to_client.Response.Location',
-    {'1': 'downloadtokens', '3': 13, '4': 1, '5': 11, '6': '.server_to_client.Response.DownloadTokens', '9': 0, '10': 'downloadtokens'},
+      '9': 0,
-    {'1': 'signedprekey', '3': 14, '4': 1, '5': 11, '6': '.server_to_client.Response.SignedPreKey', '9': 0, '10': 'signedprekey'},
+      '10': 'location'
-    {'1': 'proofOfWork', '3': 15, '4': 1, '5': 11, '6': '.server_to_client.Response.ProofOfWork', '9': 0, '10': 'proofOfWork'},
+    },
+    {
+      '1': 'authenticated',
+      '3': 8,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.Authenticated',
+      '9': 0,
+      '10': 'authenticated'
+    },
+    {
+      '1': 'plans',
+      '3': 9,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.Plans',
+      '9': 0,
+      '10': 'plans'
+    },
+    {
+      '1': 'planballance',
+      '3': 10,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.PlanBallance',
+      '9': 0,
+      '10': 'planballance'
+    },
+    {
+      '1': 'vouchers',
+      '3': 11,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.Vouchers',
+      '9': 0,
+      '10': 'vouchers'
+    },
+    {
+      '1': 'addaccountsinvites',
+      '3': 12,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.AddAccountsInvites',
+      '9': 0,
+      '10': 'addaccountsinvites'
+    },
+    {
+      '1': 'downloadtokens',
+      '3': 13,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.DownloadTokens',
+      '9': 0,
+      '10': 'downloadtokens'
+    },
+    {
+      '1': 'signedprekey',
+      '3': 14,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.SignedPreKey',
+      '9': 0,
+      '10': 'signedprekey'
+    },
+    {
+      '1': 'proofOfWork',
+      '3': 15,
+      '4': 1,
+      '5': 11,
+      '6': '.server_to_client.Response.ProofOfWork',
+      '9': 0,
+      '10': 'proofOfWork'
+    },
   ],
   '8': [
     {'1': 'Ok'},
@@ -384,4 +747,3 @@ final $typed_data.Uint8List responseDescriptor = $convert.base64Decode(
     'lwZXMSCgoGUmVmdW5kEAASEwoPVm91Y2hlclJlZGVlbWVkEAESEgoOVm91Y2hlckNyZWF0ZWQQ'
     'AhIICgRDYXNoEAMSDwoLUGxhblVwZ3JhZGUQBBILCgdVbmtub3duEAUSFAoQVGhhbmtzRm9yVG'
     'VzdGluZxAGEg8KC0F1dG9SZW5ld2FsEAdCCgoIUmVzcG9uc2U=');
-

lib/src/model/protobuf/client/generated/backup.pb.dart

@@ -1,80 +1,91 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from backup.proto.
-//  source: backup.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class TwonlySafeBackupContent extends $pb.GeneratedMessage {
   factory TwonlySafeBackupContent({
     $core.String? secureStorageJson,
     $core.List<$core.int>? twonlyDatabase,
   }) {
-    final $result = create();
+    final result = create();
-    if (secureStorageJson != null) {
+    if (secureStorageJson != null) result.secureStorageJson = secureStorageJson;
-      $result.secureStorageJson = secureStorageJson;
+    if (twonlyDatabase != null) result.twonlyDatabase = twonlyDatabase;
-    }
+    return result;
-    if (twonlyDatabase != null) {
-      $result.twonlyDatabase = twonlyDatabase;
-    }
-    return $result;
   }
-  TwonlySafeBackupContent._() : super();
-  factory TwonlySafeBackupContent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory TwonlySafeBackupContent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TwonlySafeBackupContent', createEmptyInstance: create)
+  TwonlySafeBackupContent._();
-    ..aOS(1, _omitFieldNames ? '' : 'secureStorageJson', protoName: 'secureStorageJson')
-    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'twonlyDatabase', $pb.PbFieldType.OY, protoName: 'twonlyDatabase')
-    ..hasRequiredFields = false
-  ;
 
-  @$core.Deprecated(
+  factory TwonlySafeBackupContent.fromBuffer($core.List<$core.int> data,
-  'Using this can add significant overhead to your binary. '
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      create()..mergeFromBuffer(data, registry);
-  'Will be removed in next major version')
+  factory TwonlySafeBackupContent.fromJson($core.String json,
-  TwonlySafeBackupContent clone() => TwonlySafeBackupContent()..mergeFromMessage(this);
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  @$core.Deprecated(
+      create()..mergeFromJson(json, registry);
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  TwonlySafeBackupContent copyWith(void Function(TwonlySafeBackupContent) updates) => super.copyWith((message) => updates(message as TwonlySafeBackupContent)) as TwonlySafeBackupContent;
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'TwonlySafeBackupContent',
+      createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'secureStorageJson',
+        protoName: 'secureStorageJson')
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'twonlyDatabase', $pb.PbFieldType.OY,
+        protoName: 'twonlyDatabase')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  TwonlySafeBackupContent clone() =>
+      TwonlySafeBackupContent()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  TwonlySafeBackupContent copyWith(
+          void Function(TwonlySafeBackupContent) updates) =>
+      super.copyWith((message) => updates(message as TwonlySafeBackupContent))
+          as TwonlySafeBackupContent;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static TwonlySafeBackupContent create() => TwonlySafeBackupContent._();
+  @$core.override
   TwonlySafeBackupContent createEmptyInstance() => create();
-  static $pb.PbList<TwonlySafeBackupContent> createRepeated() => $pb.PbList<TwonlySafeBackupContent>();
+  static $pb.PbList<TwonlySafeBackupContent> createRepeated() =>
+      $pb.PbList<TwonlySafeBackupContent>();
   @$core.pragma('dart2js:noInline')
-  static TwonlySafeBackupContent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupContent>(create);
+  static TwonlySafeBackupContent getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupContent>(create);
   static TwonlySafeBackupContent? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get secureStorageJson => $_getSZ(0);
   @$pb.TagNumber(1)
-  set secureStorageJson($core.String v) { $_setString(0, v); }
+  set secureStorageJson($core.String value) => $_setString(0, value);
   @$pb.TagNumber(1)
   $core.bool hasSecureStorageJson() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSecureStorageJson() => clearField(1);
+  void clearSecureStorageJson() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.List<$core.int> get twonlyDatabase => $_getN(1);
   @$pb.TagNumber(2)
-  set twonlyDatabase($core.List<$core.int> v) { $_setBytes(1, v); }
+  set twonlyDatabase($core.List<$core.int> value) => $_setBytes(1, value);
   @$pb.TagNumber(2)
   $core.bool hasTwonlyDatabase() => $_has(1);
   @$pb.TagNumber(2)
-  void clearTwonlyDatabase() => clearField(2);
+  void clearTwonlyDatabase() => $_clearField(2);
 }
 
 class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
@@ -83,78 +94,86 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
     $core.List<$core.int>? nonce,
     $core.List<$core.int>? cipherText,
   }) {
-    final $result = create();
+    final result = create();
-    if (mac != null) {
+    if (mac != null) result.mac = mac;
-      $result.mac = mac;
+    if (nonce != null) result.nonce = nonce;
-    }
+    if (cipherText != null) result.cipherText = cipherText;
-    if (nonce != null) {
+    return result;
-      $result.nonce = nonce;
-    }
-    if (cipherText != null) {
-      $result.cipherText = cipherText;
-    }
-    return $result;
   }
-  TwonlySafeBackupEncrypted._() : super();
-  factory TwonlySafeBackupEncrypted.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory TwonlySafeBackupEncrypted.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TwonlySafeBackupEncrypted', createEmptyInstance: create)
+  TwonlySafeBackupEncrypted._();
-    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(3, _omitFieldNames ? '' : 'cipherText', $pb.PbFieldType.OY, protoName: 'cipherText')
-    ..hasRequiredFields = false
-  ;
 
-  @$core.Deprecated(
+  factory TwonlySafeBackupEncrypted.fromBuffer($core.List<$core.int> data,
-  'Using this can add significant overhead to your binary. '
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      create()..mergeFromBuffer(data, registry);
-  'Will be removed in next major version')
+  factory TwonlySafeBackupEncrypted.fromJson($core.String json,
-  TwonlySafeBackupEncrypted clone() => TwonlySafeBackupEncrypted()..mergeFromMessage(this);
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  @$core.Deprecated(
+      create()..mergeFromJson(json, registry);
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  TwonlySafeBackupEncrypted copyWith(void Function(TwonlySafeBackupEncrypted) updates) => super.copyWith((message) => updates(message as TwonlySafeBackupEncrypted)) as TwonlySafeBackupEncrypted;
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'TwonlySafeBackupEncrypted',
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'cipherText', $pb.PbFieldType.OY,
+        protoName: 'cipherText')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  TwonlySafeBackupEncrypted clone() =>
+      TwonlySafeBackupEncrypted()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  TwonlySafeBackupEncrypted copyWith(
+          void Function(TwonlySafeBackupEncrypted) updates) =>
+      super.copyWith((message) => updates(message as TwonlySafeBackupEncrypted))
+          as TwonlySafeBackupEncrypted;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static TwonlySafeBackupEncrypted create() => TwonlySafeBackupEncrypted._();
+  @$core.override
   TwonlySafeBackupEncrypted createEmptyInstance() => create();
-  static $pb.PbList<TwonlySafeBackupEncrypted> createRepeated() => $pb.PbList<TwonlySafeBackupEncrypted>();
+  static $pb.PbList<TwonlySafeBackupEncrypted> createRepeated() =>
+      $pb.PbList<TwonlySafeBackupEncrypted>();
   @$core.pragma('dart2js:noInline')
-  static TwonlySafeBackupEncrypted getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupEncrypted>(create);
+  static TwonlySafeBackupEncrypted getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupEncrypted>(create);
   static TwonlySafeBackupEncrypted? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.List<$core.int> get mac => $_getN(0);
   @$pb.TagNumber(1)
-  set mac($core.List<$core.int> v) { $_setBytes(0, v); }
+  set mac($core.List<$core.int> value) => $_setBytes(0, value);
   @$pb.TagNumber(1)
   $core.bool hasMac() => $_has(0);
   @$pb.TagNumber(1)
-  void clearMac() => clearField(1);
+  void clearMac() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.List<$core.int> get nonce => $_getN(1);
   @$pb.TagNumber(2)
-  set nonce($core.List<$core.int> v) { $_setBytes(1, v); }
+  set nonce($core.List<$core.int> value) => $_setBytes(1, value);
   @$pb.TagNumber(2)
   $core.bool hasNonce() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNonce() => clearField(2);
+  void clearNonce() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.List<$core.int> get cipherText => $_getN(2);
   @$pb.TagNumber(3)
-  set cipherText($core.List<$core.int> v) { $_setBytes(2, v); }
+  set cipherText($core.List<$core.int> value) => $_setBytes(2, value);
   @$pb.TagNumber(3)
   $core.bool hasCipherText() => $_has(2);
   @$pb.TagNumber(3)
-  void clearCipherText() => clearField(3);
+  void clearCipherText() => $_clearField(3);
 }
 
-
+const $core.bool _omitFieldNames =
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/src/model/protobuf/client/generated/backup.pbenum.dart

@@ -1,11 +1,11 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from backup.proto.
-//  source: backup.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-
+// ignore_for_file: non_constant_identifier_names

lib/src/model/protobuf/client/generated/backup.pbjson.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from backup.proto.
-//  source: backup.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -17,7 +18,13 @@ import 'dart:typed_data' as $typed_data;
 const TwonlySafeBackupContent$json = {
   '1': 'TwonlySafeBackupContent',
   '2': [
-    {'1': 'secureStorageJson', '3': 1, '4': 1, '5': 9, '10': 'secureStorageJson'},
+    {
+      '1': 'secureStorageJson',
+      '3': 1,
+      '4': 1,
+      '5': 9,
+      '10': 'secureStorageJson'
+    },
     {'1': 'twonlyDatabase', '3': 2, '4': 1, '5': 12, '10': 'twonlyDatabase'},
   ],
 };
@@ -38,7 +45,7 @@ const TwonlySafeBackupEncrypted$json = {
 };
 
 /// Descriptor for `TwonlySafeBackupEncrypted`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List twonlySafeBackupEncryptedDescriptor = $convert.base64Decode(
+final $typed_data.Uint8List twonlySafeBackupEncryptedDescriptor =
-    'ChlUd29ubHlTYWZlQmFja3VwRW5jcnlwdGVkEhAKA21hYxgBIAEoDFIDbWFjEhQKBW5vbmNlGA'
+    $convert.base64Decode(
-    'IgASgMUgVub25jZRIeCgpjaXBoZXJUZXh0GAMgASgMUgpjaXBoZXJUZXh0');
+        'ChlUd29ubHlTYWZlQmFja3VwRW5jcnlwdGVkEhAKA21hYxgBIAEoDFIDbWFjEhQKBW5vbmNlGA'
-
+        'IgASgMUgVub25jZRIeCgpjaXBoZXJUZXh0GAMgASgMUgpjaXBoZXJUZXh0');

lib/src/model/protobuf/client/generated/groups.pb.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from groups.proto.
-//  source: groups.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 import 'dart:core' as $core;
 
@@ -16,6 +17,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'groups.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'groups.pbenum.dart';
 
 /// Stored encrypted on the server in the members columns.
@@ -27,140 +30,157 @@ class EncryptedGroupState extends $pb.GeneratedMessage {
     $fixnum.Int64? deleteMessagesAfterMilliseconds,
     $core.List<$core.int>? padding,
   }) {
-    final $result = create();
+    final result = create();
-    if (memberIds != null) {
+    if (memberIds != null) result.memberIds.addAll(memberIds);
-      $result.memberIds.addAll(memberIds);
+    if (adminIds != null) result.adminIds.addAll(adminIds);
-    }
+    if (groupName != null) result.groupName = groupName;
-    if (adminIds != null) {
+    if (deleteMessagesAfterMilliseconds != null)
-      $result.adminIds.addAll(adminIds);
+      result.deleteMessagesAfterMilliseconds = deleteMessagesAfterMilliseconds;
-    }
+    if (padding != null) result.padding = padding;
-    if (groupName != null) {
+    return result;
-      $result.groupName = groupName;
-    }
-    if (deleteMessagesAfterMilliseconds != null) {
-      $result.deleteMessagesAfterMilliseconds = deleteMessagesAfterMilliseconds;
-    }
-    if (padding != null) {
-      $result.padding = padding;
-    }
-    return $result;
   }
-  EncryptedGroupState._() : super();
-  factory EncryptedGroupState.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EncryptedGroupState.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EncryptedGroupState', createEmptyInstance: create)
+  EncryptedGroupState._();
-    ..p<$fixnum.Int64>(1, _omitFieldNames ? '' : 'memberIds', $pb.PbFieldType.K6, protoName: 'memberIds')
+
-    ..p<$fixnum.Int64>(2, _omitFieldNames ? '' : 'adminIds', $pb.PbFieldType.K6, protoName: 'adminIds')
+  factory EncryptedGroupState.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EncryptedGroupState.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _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')
+    ..aInt64(4, _omitFieldNames ? '' : 'deleteMessagesAfterMilliseconds',
-    ..a<$core.List<$core.int>>(5, _omitFieldNames ? '' : 'padding', $pb.PbFieldType.OY)
+        protoName: 'deleteMessagesAfterMilliseconds')
-    ..hasRequiredFields = false
+    ..a<$core.List<$core.int>>(
-  ;
+        5, _omitFieldNames ? '' : 'padding', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
   EncryptedGroupState clone() => EncryptedGroupState()..mergeFromMessage(this);
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
+  EncryptedGroupState copyWith(void Function(EncryptedGroupState) updates) =>
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      super.copyWith((message) => updates(message as EncryptedGroupState))
-  'Will be removed in next major version')
+          as EncryptedGroupState;
-  EncryptedGroupState copyWith(void Function(EncryptedGroupState) updates) => super.copyWith((message) => updates(message as EncryptedGroupState)) as EncryptedGroupState;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static EncryptedGroupState create() => EncryptedGroupState._();
+  @$core.override
   EncryptedGroupState createEmptyInstance() => create();
-  static $pb.PbList<EncryptedGroupState> createRepeated() => $pb.PbList<EncryptedGroupState>();
+  static $pb.PbList<EncryptedGroupState> createRepeated() =>
+      $pb.PbList<EncryptedGroupState>();
   @$core.pragma('dart2js:noInline')
-  static EncryptedGroupState getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EncryptedGroupState>(create);
+  static EncryptedGroupState getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EncryptedGroupState>(create);
   static EncryptedGroupState? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<$fixnum.Int64> get memberIds => $_getList(0);
+  $pb.PbList<$fixnum.Int64> get memberIds => $_getList(0);
 
   @$pb.TagNumber(2)
-  $core.List<$fixnum.Int64> get adminIds => $_getList(1);
+  $pb.PbList<$fixnum.Int64> get adminIds => $_getList(1);
 
   @$pb.TagNumber(3)
   $core.String get groupName => $_getSZ(2);
   @$pb.TagNumber(3)
-  set groupName($core.String v) { $_setString(2, v); }
+  set groupName($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasGroupName() => $_has(2);
   @$pb.TagNumber(3)
-  void clearGroupName() => clearField(3);
+  void clearGroupName() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $fixnum.Int64 get deleteMessagesAfterMilliseconds => $_getI64(3);
   @$pb.TagNumber(4)
-  set deleteMessagesAfterMilliseconds($fixnum.Int64 v) { $_setInt64(3, v); }
+  set deleteMessagesAfterMilliseconds($fixnum.Int64 value) =>
+      $_setInt64(3, value);
   @$pb.TagNumber(4)
   $core.bool hasDeleteMessagesAfterMilliseconds() => $_has(3);
   @$pb.TagNumber(4)
-  void clearDeleteMessagesAfterMilliseconds() => clearField(4);
+  void clearDeleteMessagesAfterMilliseconds() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.List<$core.int> get padding => $_getN(4);
   @$pb.TagNumber(5)
-  set padding($core.List<$core.int> v) { $_setBytes(4, v); }
+  set padding($core.List<$core.int> value) => $_setBytes(4, value);
   @$pb.TagNumber(5)
   $core.bool hasPadding() => $_has(4);
   @$pb.TagNumber(5)
-  void clearPadding() => clearField(5);
+  void clearPadding() => $_clearField(5);
 }
 
 class EncryptedAppendedGroupState extends $pb.GeneratedMessage {
   factory EncryptedAppendedGroupState({
     EncryptedAppendedGroupState_Type? type,
   }) {
-    final $result = create();
+    final result = create();
-    if (type != null) {
+    if (type != null) result.type = type;
-      $result.type = type;
+    return result;
-    }
-    return $result;
   }
-  EncryptedAppendedGroupState._() : super();
-  factory EncryptedAppendedGroupState.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EncryptedAppendedGroupState.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EncryptedAppendedGroupState', createEmptyInstance: create)
+  EncryptedAppendedGroupState._();
-    ..e<EncryptedAppendedGroupState_Type>(1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: EncryptedAppendedGroupState_Type.LEFT_GROUP, valueOf: EncryptedAppendedGroupState_Type.valueOf, enumValues: EncryptedAppendedGroupState_Type.values)
-    ..hasRequiredFields = false
-  ;
 
-  @$core.Deprecated(
+  factory EncryptedAppendedGroupState.fromBuffer($core.List<$core.int> data,
-  'Using this can add significant overhead to your binary. '
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      create()..mergeFromBuffer(data, registry);
-  'Will be removed in next major version')
+  factory EncryptedAppendedGroupState.fromJson($core.String json,
-  EncryptedAppendedGroupState clone() => EncryptedAppendedGroupState()..mergeFromMessage(this);
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  @$core.Deprecated(
+      create()..mergeFromJson(json, registry);
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  EncryptedAppendedGroupState copyWith(void Function(EncryptedAppendedGroupState) updates) => super.copyWith((message) => updates(message as EncryptedAppendedGroupState)) as EncryptedAppendedGroupState;
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedAppendedGroupState',
+      createEmptyInstance: create)
+    ..e<EncryptedAppendedGroupState_Type>(
+        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
+        defaultOrMaker: EncryptedAppendedGroupState_Type.LEFT_GROUP,
+        valueOf: EncryptedAppendedGroupState_Type.valueOf,
+        enumValues: EncryptedAppendedGroupState_Type.values)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedAppendedGroupState clone() =>
+      EncryptedAppendedGroupState()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedAppendedGroupState copyWith(
+          void Function(EncryptedAppendedGroupState) updates) =>
+      super.copyWith(
+              (message) => updates(message as EncryptedAppendedGroupState))
+          as EncryptedAppendedGroupState;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static EncryptedAppendedGroupState create() => EncryptedAppendedGroupState._();
+  static EncryptedAppendedGroupState create() =>
+      EncryptedAppendedGroupState._();
+  @$core.override
   EncryptedAppendedGroupState createEmptyInstance() => create();
-  static $pb.PbList<EncryptedAppendedGroupState> createRepeated() => $pb.PbList<EncryptedAppendedGroupState>();
+  static $pb.PbList<EncryptedAppendedGroupState> createRepeated() =>
+      $pb.PbList<EncryptedAppendedGroupState>();
   @$core.pragma('dart2js:noInline')
-  static EncryptedAppendedGroupState getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EncryptedAppendedGroupState>(create);
+  static EncryptedAppendedGroupState getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EncryptedAppendedGroupState>(create);
   static EncryptedAppendedGroupState? _defaultInstance;
 
   @$pb.TagNumber(1)
   EncryptedAppendedGroupState_Type get type => $_getN(0);
   @$pb.TagNumber(1)
-  set type(EncryptedAppendedGroupState_Type v) { setField(1, v); }
+  set type(EncryptedAppendedGroupState_Type value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearType() => clearField(1);
+  void clearType() => $_clearField(1);
 }
 
 class EncryptedGroupStateEnvelop extends $pb.GeneratedMessage {
@@ -169,78 +189,88 @@ class EncryptedGroupStateEnvelop extends $pb.GeneratedMessage {
     $core.List<$core.int>? encryptedGroupState,
     $core.List<$core.int>? mac,
   }) {
-    final $result = create();
+    final result = create();
-    if (nonce != null) {
+    if (nonce != null) result.nonce = nonce;
-      $result.nonce = nonce;
+    if (encryptedGroupState != null)
-    }
+      result.encryptedGroupState = encryptedGroupState;
-    if (encryptedGroupState != null) {
+    if (mac != null) result.mac = mac;
-      $result.encryptedGroupState = encryptedGroupState;
+    return result;
-    }
-    if (mac != null) {
-      $result.mac = mac;
-    }
-    return $result;
   }
-  EncryptedGroupStateEnvelop._() : super();
-  factory EncryptedGroupStateEnvelop.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EncryptedGroupStateEnvelop.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EncryptedGroupStateEnvelop', createEmptyInstance: create)
+  EncryptedGroupStateEnvelop._();
-    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'encryptedGroupState', $pb.PbFieldType.OY, protoName: 'encryptedGroupState')
-    ..a<$core.List<$core.int>>(3, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
-    ..hasRequiredFields = false
-  ;
 
-  @$core.Deprecated(
+  factory EncryptedGroupStateEnvelop.fromBuffer($core.List<$core.int> data,
-  'Using this can add significant overhead to your binary. '
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      create()..mergeFromBuffer(data, registry);
-  'Will be removed in next major version')
+  factory EncryptedGroupStateEnvelop.fromJson($core.String json,
-  EncryptedGroupStateEnvelop clone() => EncryptedGroupStateEnvelop()..mergeFromMessage(this);
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  @$core.Deprecated(
+      create()..mergeFromJson(json, registry);
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  EncryptedGroupStateEnvelop copyWith(void Function(EncryptedGroupStateEnvelop) updates) => super.copyWith((message) => updates(message as EncryptedGroupStateEnvelop)) as EncryptedGroupStateEnvelop;
 
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedGroupStateEnvelop',
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'encryptedGroupState', $pb.PbFieldType.OY,
+        protoName: 'encryptedGroupState')
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedGroupStateEnvelop clone() =>
+      EncryptedGroupStateEnvelop()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedGroupStateEnvelop copyWith(
+          void Function(EncryptedGroupStateEnvelop) updates) =>
+      super.copyWith(
+              (message) => updates(message as EncryptedGroupStateEnvelop))
+          as EncryptedGroupStateEnvelop;
+
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static EncryptedGroupStateEnvelop create() => EncryptedGroupStateEnvelop._();
+  @$core.override
   EncryptedGroupStateEnvelop createEmptyInstance() => create();
-  static $pb.PbList<EncryptedGroupStateEnvelop> createRepeated() => $pb.PbList<EncryptedGroupStateEnvelop>();
+  static $pb.PbList<EncryptedGroupStateEnvelop> createRepeated() =>
+      $pb.PbList<EncryptedGroupStateEnvelop>();
   @$core.pragma('dart2js:noInline')
-  static EncryptedGroupStateEnvelop getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EncryptedGroupStateEnvelop>(create);
+  static EncryptedGroupStateEnvelop getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EncryptedGroupStateEnvelop>(create);
   static EncryptedGroupStateEnvelop? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.List<$core.int> get nonce => $_getN(0);
   @$pb.TagNumber(1)
-  set nonce($core.List<$core.int> v) { $_setBytes(0, v); }
+  set nonce($core.List<$core.int> value) => $_setBytes(0, value);
   @$pb.TagNumber(1)
   $core.bool hasNonce() => $_has(0);
   @$pb.TagNumber(1)
-  void clearNonce() => clearField(1);
+  void clearNonce() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.List<$core.int> get encryptedGroupState => $_getN(1);
   @$pb.TagNumber(2)
-  set encryptedGroupState($core.List<$core.int> v) { $_setBytes(1, v); }
+  set encryptedGroupState($core.List<$core.int> value) => $_setBytes(1, value);
   @$pb.TagNumber(2)
   $core.bool hasEncryptedGroupState() => $_has(1);
   @$pb.TagNumber(2)
-  void clearEncryptedGroupState() => clearField(2);
+  void clearEncryptedGroupState() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.List<$core.int> get mac => $_getN(2);
   @$pb.TagNumber(3)
-  set mac($core.List<$core.int> v) { $_setBytes(2, v); }
+  set mac($core.List<$core.int> value) => $_setBytes(2, value);
   @$pb.TagNumber(3)
   $core.bool hasMac() => $_has(2);
   @$pb.TagNumber(3)
-  void clearMac() => clearField(3);
+  void clearMac() => $_clearField(3);
 }
 
-
+const $core.bool _omitFieldNames =
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/src/model/protobuf/client/generated/groups.pbenum.dart

@@ -1,30 +1,35 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from groups.proto.
-//  source: groups.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class EncryptedAppendedGroupState_Type extends $pb.ProtobufEnum {
-  static const EncryptedAppendedGroupState_Type LEFT_GROUP = EncryptedAppendedGroupState_Type._(0, _omitEnumNames ? '' : 'LEFT_GROUP');
+  static const EncryptedAppendedGroupState_Type LEFT_GROUP =
+      EncryptedAppendedGroupState_Type._(0, _omitEnumNames ? '' : 'LEFT_GROUP');
 
-  static const $core.List<EncryptedAppendedGroupState_Type> values = <EncryptedAppendedGroupState_Type> [
+  static const $core.List<EncryptedAppendedGroupState_Type> values =
+      <EncryptedAppendedGroupState_Type>[
     LEFT_GROUP,
   ];
 
-  static final $core.Map<$core.int, EncryptedAppendedGroupState_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<EncryptedAppendedGroupState_Type?> _byValue =
-  static EncryptedAppendedGroupState_Type? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 0);
+  static EncryptedAppendedGroupState_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const EncryptedAppendedGroupState_Type._($core.int v, $core.String n) : super(v, n);
+  const EncryptedAppendedGroupState_Type._(super.value, super.name);
 }
 
-
+const $core.bool _omitEnumNames =
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+    $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/src/model/protobuf/client/generated/groups.pbjson.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from groups.proto.
-//  source: groups.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -20,7 +21,15 @@ const EncryptedGroupState$json = {
     {'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': 'deleteMessagesAfterMilliseconds', '3': 4, '4': 1, '5': 3, '9': 0, '10': 'deleteMessagesAfterMilliseconds', '17': true},
+    {
+      '1': 'deleteMessagesAfterMilliseconds',
+      '3': 4,
+      '4': 1,
+      '5': 3,
+      '9': 0,
+      '10': 'deleteMessagesAfterMilliseconds',
+      '17': true
+    },
     {'1': 'padding', '3': 5, '4': 1, '5': 12, '10': 'padding'},
   ],
   '8': [
@@ -40,7 +49,14 @@ final $typed_data.Uint8List encryptedGroupStateDescriptor = $convert.base64Decod
 const EncryptedAppendedGroupState$json = {
   '1': 'EncryptedAppendedGroupState',
   '2': [
-    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.EncryptedAppendedGroupState.Type', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 1,
+      '4': 1,
+      '5': 14,
+      '6': '.EncryptedAppendedGroupState.Type',
+      '10': 'type'
+    },
   ],
   '4': [EncryptedAppendedGroupState_Type$json],
 };
@@ -54,23 +70,30 @@ const EncryptedAppendedGroupState_Type$json = {
 };
 
 /// Descriptor for `EncryptedAppendedGroupState`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List encryptedAppendedGroupStateDescriptor = $convert.base64Decode(
+final $typed_data.Uint8List encryptedAppendedGroupStateDescriptor =
-    'ChtFbmNyeXB0ZWRBcHBlbmRlZEdyb3VwU3RhdGUSNQoEdHlwZRgBIAEoDjIhLkVuY3J5cHRlZE'
+    $convert.base64Decode(
-    'FwcGVuZGVkR3JvdXBTdGF0ZS5UeXBlUgR0eXBlIhYKBFR5cGUSDgoKTEVGVF9HUk9VUBAA');
+        'ChtFbmNyeXB0ZWRBcHBlbmRlZEdyb3VwU3RhdGUSNQoEdHlwZRgBIAEoDjIhLkVuY3J5cHRlZE'
+        'FwcGVuZGVkR3JvdXBTdGF0ZS5UeXBlUgR0eXBlIhYKBFR5cGUSDgoKTEVGVF9HUk9VUBAA');
 
 @$core.Deprecated('Use encryptedGroupStateEnvelopDescriptor instead')
 const EncryptedGroupStateEnvelop$json = {
   '1': 'EncryptedGroupStateEnvelop',
   '2': [
     {'1': 'nonce', '3': 1, '4': 1, '5': 12, '10': 'nonce'},
-    {'1': 'encryptedGroupState', '3': 2, '4': 1, '5': 12, '10': 'encryptedGroupState'},
+    {
+      '1': 'encryptedGroupState',
+      '3': 2,
+      '4': 1,
+      '5': 12,
+      '10': 'encryptedGroupState'
+    },
     {'1': 'mac', '3': 3, '4': 1, '5': 12, '10': 'mac'},
   ],
 };
 
 /// Descriptor for `EncryptedGroupStateEnvelop`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List encryptedGroupStateEnvelopDescriptor = $convert.base64Decode(
+final $typed_data.Uint8List encryptedGroupStateEnvelopDescriptor =
-    'ChpFbmNyeXB0ZWRHcm91cFN0YXRlRW52ZWxvcBIUCgVub25jZRgBIAEoDFIFbm9uY2USMAoTZW'
+    $convert.base64Decode(
-    '5jcnlwdGVkR3JvdXBTdGF0ZRgCIAEoDFITZW5jcnlwdGVkR3JvdXBTdGF0ZRIQCgNtYWMYAyAB'
+        'ChpFbmNyeXB0ZWRHcm91cFN0YXRlRW52ZWxvcBIUCgVub25jZRgBIAEoDFIFbm9uY2USMAoTZW'
-    'KAxSA21hYw==');
+        '5jcnlwdGVkR3JvdXBTdGF0ZRgCIAEoDFITZW5jcnlwdGVkR3JvdXBTdGF0ZRIQCgNtYWMYAyAB'
-
+        'KAxSA21hYw==');

lib/src/model/protobuf/client/generated/messages.pbenum.dart

@@ -1,26 +1,32 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from messages.proto.
-//  source: messages.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class Message_Type extends $pb.ProtobufEnum {
-  static const Message_Type SENDER_DELIVERY_RECEIPT = Message_Type._(0, _omitEnumNames ? '' : 'SENDER_DELIVERY_RECEIPT');
+  static const Message_Type SENDER_DELIVERY_RECEIPT =
-  static const Message_Type PLAINTEXT_CONTENT = Message_Type._(1, _omitEnumNames ? '' : 'PLAINTEXT_CONTENT');
+      Message_Type._(0, _omitEnumNames ? '' : 'SENDER_DELIVERY_RECEIPT');
-  static const Message_Type CIPHERTEXT = Message_Type._(2, _omitEnumNames ? '' : 'CIPHERTEXT');
+  static const Message_Type PLAINTEXT_CONTENT =
-  static const Message_Type PREKEY_BUNDLE = Message_Type._(3, _omitEnumNames ? '' : 'PREKEY_BUNDLE');
+      Message_Type._(1, _omitEnumNames ? '' : 'PLAINTEXT_CONTENT');
-  static const Message_Type TEST_NOTIFICATION = Message_Type._(4, _omitEnumNames ? '' : 'TEST_NOTIFICATION');
+  static const Message_Type CIPHERTEXT =
+      Message_Type._(2, _omitEnumNames ? '' : 'CIPHERTEXT');
+  static const Message_Type PREKEY_BUNDLE =
+      Message_Type._(3, _omitEnumNames ? '' : 'PREKEY_BUNDLE');
+  static const Message_Type TEST_NOTIFICATION =
+      Message_Type._(4, _omitEnumNames ? '' : 'TEST_NOTIFICATION');
 
-  static const $core.List<Message_Type> values = <Message_Type> [
+  static const $core.List<Message_Type> values = <Message_Type>[
     SENDER_DELIVERY_RECEIPT,
     PLAINTEXT_CONTENT,
     CIPHERTEXT,
@@ -28,52 +34,75 @@ class Message_Type extends $pb.ProtobufEnum {
     TEST_NOTIFICATION,
   ];
 
-  static final $core.Map<$core.int, Message_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<Message_Type?> _byValue =
-  static Message_Type? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 4);
+  static Message_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const Message_Type._($core.int v, $core.String n) : super(v, n);
+  const Message_Type._(super.value, super.name);
 }
 
 class PlaintextContent_DecryptionErrorMessage_Type extends $pb.ProtobufEnum {
-  static const PlaintextContent_DecryptionErrorMessage_Type UNKNOWN = PlaintextContent_DecryptionErrorMessage_Type._(0, _omitEnumNames ? '' : 'UNKNOWN');
+  static const PlaintextContent_DecryptionErrorMessage_Type UNKNOWN =
-  static const PlaintextContent_DecryptionErrorMessage_Type PREKEY_UNKNOWN = PlaintextContent_DecryptionErrorMessage_Type._(1, _omitEnumNames ? '' : 'PREKEY_UNKNOWN');
+      PlaintextContent_DecryptionErrorMessage_Type._(
+          0, _omitEnumNames ? '' : 'UNKNOWN');
+  static const PlaintextContent_DecryptionErrorMessage_Type PREKEY_UNKNOWN =
+      PlaintextContent_DecryptionErrorMessage_Type._(
+          1, _omitEnumNames ? '' : 'PREKEY_UNKNOWN');
 
-  static const $core.List<PlaintextContent_DecryptionErrorMessage_Type> values = <PlaintextContent_DecryptionErrorMessage_Type> [
+  static const $core.List<PlaintextContent_DecryptionErrorMessage_Type> values =
+      <PlaintextContent_DecryptionErrorMessage_Type>[
     UNKNOWN,
     PREKEY_UNKNOWN,
   ];
 
-  static final $core.Map<$core.int, PlaintextContent_DecryptionErrorMessage_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<PlaintextContent_DecryptionErrorMessage_Type?>
-  static PlaintextContent_DecryptionErrorMessage_Type? valueOf($core.int value) => _byValue[value];
+      _byValue = $pb.ProtobufEnum.$_initByValueList(values, 1);
+  static PlaintextContent_DecryptionErrorMessage_Type? valueOf(
+          $core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const PlaintextContent_DecryptionErrorMessage_Type._($core.int v, $core.String n) : super(v, n);
+  const PlaintextContent_DecryptionErrorMessage_Type._(super.value, super.name);
 }
 
 class EncryptedContent_MessageUpdate_Type extends $pb.ProtobufEnum {
-  static const EncryptedContent_MessageUpdate_Type DELETE = EncryptedContent_MessageUpdate_Type._(0, _omitEnumNames ? '' : 'DELETE');
+  static const EncryptedContent_MessageUpdate_Type DELETE =
-  static const EncryptedContent_MessageUpdate_Type EDIT_TEXT = EncryptedContent_MessageUpdate_Type._(1, _omitEnumNames ? '' : 'EDIT_TEXT');
+      EncryptedContent_MessageUpdate_Type._(0, _omitEnumNames ? '' : 'DELETE');
-  static const EncryptedContent_MessageUpdate_Type OPENED = EncryptedContent_MessageUpdate_Type._(2, _omitEnumNames ? '' : 'OPENED');
+  static const EncryptedContent_MessageUpdate_Type EDIT_TEXT =
+      EncryptedContent_MessageUpdate_Type._(
+          1, _omitEnumNames ? '' : 'EDIT_TEXT');
+  static const EncryptedContent_MessageUpdate_Type OPENED =
+      EncryptedContent_MessageUpdate_Type._(2, _omitEnumNames ? '' : 'OPENED');
 
-  static const $core.List<EncryptedContent_MessageUpdate_Type> values = <EncryptedContent_MessageUpdate_Type> [
+  static const $core.List<EncryptedContent_MessageUpdate_Type> values =
+      <EncryptedContent_MessageUpdate_Type>[
     DELETE,
     EDIT_TEXT,
     OPENED,
   ];
 
-  static final $core.Map<$core.int, EncryptedContent_MessageUpdate_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<EncryptedContent_MessageUpdate_Type?> _byValue =
-  static EncryptedContent_MessageUpdate_Type? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 2);
+  static EncryptedContent_MessageUpdate_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const EncryptedContent_MessageUpdate_Type._($core.int v, $core.String n) : super(v, n);
+  const EncryptedContent_MessageUpdate_Type._(super.value, super.name);
 }
 
 class EncryptedContent_Media_Type extends $pb.ProtobufEnum {
-  static const EncryptedContent_Media_Type REUPLOAD = EncryptedContent_Media_Type._(0, _omitEnumNames ? '' : 'REUPLOAD');
+  static const EncryptedContent_Media_Type REUPLOAD =
-  static const EncryptedContent_Media_Type IMAGE = EncryptedContent_Media_Type._(1, _omitEnumNames ? '' : 'IMAGE');
+      EncryptedContent_Media_Type._(0, _omitEnumNames ? '' : 'REUPLOAD');
-  static const EncryptedContent_Media_Type VIDEO = EncryptedContent_Media_Type._(2, _omitEnumNames ? '' : 'VIDEO');
+  static const EncryptedContent_Media_Type IMAGE =
-  static const EncryptedContent_Media_Type GIF = EncryptedContent_Media_Type._(3, _omitEnumNames ? '' : 'GIF');
+      EncryptedContent_Media_Type._(1, _omitEnumNames ? '' : 'IMAGE');
-  static const EncryptedContent_Media_Type AUDIO = EncryptedContent_Media_Type._(4, _omitEnumNames ? '' : 'AUDIO');
+  static const EncryptedContent_Media_Type VIDEO =
+      EncryptedContent_Media_Type._(2, _omitEnumNames ? '' : 'VIDEO');
+  static const EncryptedContent_Media_Type GIF =
+      EncryptedContent_Media_Type._(3, _omitEnumNames ? '' : 'GIF');
+  static const EncryptedContent_Media_Type AUDIO =
+      EncryptedContent_Media_Type._(4, _omitEnumNames ? '' : 'AUDIO');
 
-  static const $core.List<EncryptedContent_Media_Type> values = <EncryptedContent_Media_Type> [
+  static const $core.List<EncryptedContent_Media_Type> values =
+      <EncryptedContent_Media_Type>[
     REUPLOAD,
     IMAGE,
     VIDEO,
@@ -81,75 +110,101 @@ class EncryptedContent_Media_Type extends $pb.ProtobufEnum {
     AUDIO,
   ];
 
-  static final $core.Map<$core.int, EncryptedContent_Media_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<EncryptedContent_Media_Type?> _byValue =
-  static EncryptedContent_Media_Type? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 4);
+  static EncryptedContent_Media_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const EncryptedContent_Media_Type._($core.int v, $core.String n) : super(v, n);
+  const EncryptedContent_Media_Type._(super.value, super.name);
 }
 
 class EncryptedContent_MediaUpdate_Type extends $pb.ProtobufEnum {
-  static const EncryptedContent_MediaUpdate_Type REOPENED = EncryptedContent_MediaUpdate_Type._(0, _omitEnumNames ? '' : 'REOPENED');
+  static const EncryptedContent_MediaUpdate_Type REOPENED =
-  static const EncryptedContent_MediaUpdate_Type STORED = EncryptedContent_MediaUpdate_Type._(1, _omitEnumNames ? '' : 'STORED');
+      EncryptedContent_MediaUpdate_Type._(0, _omitEnumNames ? '' : 'REOPENED');
-  static const EncryptedContent_MediaUpdate_Type DECRYPTION_ERROR = EncryptedContent_MediaUpdate_Type._(2, _omitEnumNames ? '' : 'DECRYPTION_ERROR');
+  static const EncryptedContent_MediaUpdate_Type STORED =
+      EncryptedContent_MediaUpdate_Type._(1, _omitEnumNames ? '' : 'STORED');
+  static const EncryptedContent_MediaUpdate_Type DECRYPTION_ERROR =
+      EncryptedContent_MediaUpdate_Type._(
+          2, _omitEnumNames ? '' : 'DECRYPTION_ERROR');
 
-  static const $core.List<EncryptedContent_MediaUpdate_Type> values = <EncryptedContent_MediaUpdate_Type> [
+  static const $core.List<EncryptedContent_MediaUpdate_Type> values =
+      <EncryptedContent_MediaUpdate_Type>[
     REOPENED,
     STORED,
     DECRYPTION_ERROR,
   ];
 
-  static final $core.Map<$core.int, EncryptedContent_MediaUpdate_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<EncryptedContent_MediaUpdate_Type?> _byValue =
-  static EncryptedContent_MediaUpdate_Type? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 2);
+  static EncryptedContent_MediaUpdate_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const EncryptedContent_MediaUpdate_Type._($core.int v, $core.String n) : super(v, n);
+  const EncryptedContent_MediaUpdate_Type._(super.value, super.name);
 }
 
 class EncryptedContent_ContactRequest_Type extends $pb.ProtobufEnum {
-  static const EncryptedContent_ContactRequest_Type REQUEST = EncryptedContent_ContactRequest_Type._(0, _omitEnumNames ? '' : 'REQUEST');
+  static const EncryptedContent_ContactRequest_Type REQUEST =
-  static const EncryptedContent_ContactRequest_Type REJECT = EncryptedContent_ContactRequest_Type._(1, _omitEnumNames ? '' : 'REJECT');
+      EncryptedContent_ContactRequest_Type._(
-  static const EncryptedContent_ContactRequest_Type ACCEPT = EncryptedContent_ContactRequest_Type._(2, _omitEnumNames ? '' : 'ACCEPT');
+          0, _omitEnumNames ? '' : 'REQUEST');
+  static const EncryptedContent_ContactRequest_Type REJECT =
+      EncryptedContent_ContactRequest_Type._(1, _omitEnumNames ? '' : 'REJECT');
+  static const EncryptedContent_ContactRequest_Type ACCEPT =
+      EncryptedContent_ContactRequest_Type._(2, _omitEnumNames ? '' : 'ACCEPT');
 
-  static const $core.List<EncryptedContent_ContactRequest_Type> values = <EncryptedContent_ContactRequest_Type> [
+  static const $core.List<EncryptedContent_ContactRequest_Type> values =
+      <EncryptedContent_ContactRequest_Type>[
     REQUEST,
     REJECT,
     ACCEPT,
   ];
 
-  static final $core.Map<$core.int, EncryptedContent_ContactRequest_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<EncryptedContent_ContactRequest_Type?> _byValue =
-  static EncryptedContent_ContactRequest_Type? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 2);
+  static EncryptedContent_ContactRequest_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const EncryptedContent_ContactRequest_Type._($core.int v, $core.String n) : super(v, n);
+  const EncryptedContent_ContactRequest_Type._(super.value, super.name);
 }
 
 class EncryptedContent_ContactUpdate_Type extends $pb.ProtobufEnum {
-  static const EncryptedContent_ContactUpdate_Type REQUEST = EncryptedContent_ContactUpdate_Type._(0, _omitEnumNames ? '' : 'REQUEST');
+  static const EncryptedContent_ContactUpdate_Type REQUEST =
-  static const EncryptedContent_ContactUpdate_Type UPDATE = EncryptedContent_ContactUpdate_Type._(1, _omitEnumNames ? '' : 'UPDATE');
+      EncryptedContent_ContactUpdate_Type._(0, _omitEnumNames ? '' : 'REQUEST');
+  static const EncryptedContent_ContactUpdate_Type UPDATE =
+      EncryptedContent_ContactUpdate_Type._(1, _omitEnumNames ? '' : 'UPDATE');
 
-  static const $core.List<EncryptedContent_ContactUpdate_Type> values = <EncryptedContent_ContactUpdate_Type> [
+  static const $core.List<EncryptedContent_ContactUpdate_Type> values =
+      <EncryptedContent_ContactUpdate_Type>[
     REQUEST,
     UPDATE,
   ];
 
-  static final $core.Map<$core.int, EncryptedContent_ContactUpdate_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<EncryptedContent_ContactUpdate_Type?> _byValue =
-  static EncryptedContent_ContactUpdate_Type? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 1);
+  static EncryptedContent_ContactUpdate_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const EncryptedContent_ContactUpdate_Type._($core.int v, $core.String n) : super(v, n);
+  const EncryptedContent_ContactUpdate_Type._(super.value, super.name);
 }
 
 class EncryptedContent_PushKeys_Type extends $pb.ProtobufEnum {
-  static const EncryptedContent_PushKeys_Type REQUEST = EncryptedContent_PushKeys_Type._(0, _omitEnumNames ? '' : 'REQUEST');
+  static const EncryptedContent_PushKeys_Type REQUEST =
-  static const EncryptedContent_PushKeys_Type UPDATE = EncryptedContent_PushKeys_Type._(1, _omitEnumNames ? '' : 'UPDATE');
+      EncryptedContent_PushKeys_Type._(0, _omitEnumNames ? '' : 'REQUEST');
+  static const EncryptedContent_PushKeys_Type UPDATE =
+      EncryptedContent_PushKeys_Type._(1, _omitEnumNames ? '' : 'UPDATE');
 
-  static const $core.List<EncryptedContent_PushKeys_Type> values = <EncryptedContent_PushKeys_Type> [
+  static const $core.List<EncryptedContent_PushKeys_Type> values =
+      <EncryptedContent_PushKeys_Type>[
     REQUEST,
     UPDATE,
   ];
 
-  static final $core.Map<$core.int, EncryptedContent_PushKeys_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<EncryptedContent_PushKeys_Type?> _byValue =
-  static EncryptedContent_PushKeys_Type? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 1);
+  static EncryptedContent_PushKeys_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const EncryptedContent_PushKeys_Type._($core.int v, $core.String n) : super(v, n);
+  const EncryptedContent_PushKeys_Type._(super.value, super.name);
 }
 
-
+const $core.bool _omitEnumNames =
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+    $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/src/model/protobuf/client/generated/messages.pbjson.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from messages.proto.
-//  source: messages.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -19,8 +20,25 @@ const Message$json = {
   '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': 'encryptedContent', '3': 3, '4': 1, '5': 12, '9': 0, '10': 'encryptedContent', '17': true},
+    {
-    {'1': 'plaintextContent', '3': 4, '4': 1, '5': 11, '6': '.PlaintextContent', '9': 1, '10': 'plaintextContent', '17': true},
+      '1': 'encryptedContent',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '9': 0,
+      '10': 'encryptedContent',
+      '17': true
+    },
+    {
+      '1': 'plaintextContent',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.PlaintextContent',
+      '9': 1,
+      '10': 'plaintextContent',
+      '17': true
+    },
   ],
   '4': [Message_Type$json],
   '8': [
@@ -55,10 +73,31 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode(
 const PlaintextContent$json = {
   '1': 'PlaintextContent',
   '2': [
-    {'1': 'decryptionErrorMessage', '3': 1, '4': 1, '5': 11, '6': '.PlaintextContent.DecryptionErrorMessage', '9': 0, '10': 'decryptionErrorMessage', '17': true},
+    {
-    {'1': 'retryControlError', '3': 2, '4': 1, '5': 11, '6': '.PlaintextContent.RetryErrorMessage', '9': 1, '10': 'retryControlError', '17': true},
+      '1': 'decryptionErrorMessage',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.PlaintextContent.DecryptionErrorMessage',
+      '9': 0,
+      '10': 'decryptionErrorMessage',
+      '17': true
+    },
+    {
+      '1': 'retryControlError',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.PlaintextContent.RetryErrorMessage',
+      '9': 1,
+      '10': 'retryControlError',
+      '17': true
+    },
+  ],
+  '3': [
+    PlaintextContent_RetryErrorMessage$json,
+    PlaintextContent_DecryptionErrorMessage$json
   ],
-  '3': [PlaintextContent_RetryErrorMessage$json, PlaintextContent_DecryptionErrorMessage$json],
   '8': [
     {'1': '_decryptionErrorMessage'},
     {'1': '_retryControlError'},
@@ -74,7 +113,14 @@ const PlaintextContent_RetryErrorMessage$json = {
 const PlaintextContent_DecryptionErrorMessage$json = {
   '1': 'DecryptionErrorMessage',
   '2': [
-    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.PlaintextContent.DecryptionErrorMessage.Type', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 1,
+      '4': 1,
+      '5': 14,
+      '6': '.PlaintextContent.DecryptionErrorMessage.Type',
+      '10': 'type'
+    },
   ],
   '4': [PlaintextContent_DecryptionErrorMessage_Type$json],
 };
@@ -103,24 +149,179 @@ final $typed_data.Uint8List plaintextContentDescriptor = $convert.base64Decode(
 const EncryptedContent$json = {
   '1': 'EncryptedContent',
   '2': [
-    {'1': 'groupId', '3': 2, '4': 1, '5': 9, '9': 0, '10': 'groupId', '17': true},
+    {
-    {'1': 'isDirectChat', '3': 3, '4': 1, '5': 8, '9': 1, '10': 'isDirectChat', '17': true},
+      '1': 'groupId',
-    {'1': 'senderProfileCounter', '3': 4, '4': 1, '5': 3, '9': 2, '10': 'senderProfileCounter', '17': true},
+      '3': 2,
-    {'1': 'messageUpdate', '3': 5, '4': 1, '5': 11, '6': '.EncryptedContent.MessageUpdate', '9': 3, '10': 'messageUpdate', '17': true},
+      '4': 1,
-    {'1': 'media', '3': 6, '4': 1, '5': 11, '6': '.EncryptedContent.Media', '9': 4, '10': 'media', '17': true},
+      '5': 9,
-    {'1': 'mediaUpdate', '3': 7, '4': 1, '5': 11, '6': '.EncryptedContent.MediaUpdate', '9': 5, '10': 'mediaUpdate', '17': true},
+      '9': 0,
-    {'1': 'contactUpdate', '3': 8, '4': 1, '5': 11, '6': '.EncryptedContent.ContactUpdate', '9': 6, '10': 'contactUpdate', '17': true},
+      '10': 'groupId',
-    {'1': 'contactRequest', '3': 9, '4': 1, '5': 11, '6': '.EncryptedContent.ContactRequest', '9': 7, '10': 'contactRequest', '17': true},
+      '17': true
-    {'1': 'flameSync', '3': 10, '4': 1, '5': 11, '6': '.EncryptedContent.FlameSync', '9': 8, '10': 'flameSync', '17': true},
+    },
-    {'1': 'pushKeys', '3': 11, '4': 1, '5': 11, '6': '.EncryptedContent.PushKeys', '9': 9, '10': 'pushKeys', '17': true},
+    {
-    {'1': 'reaction', '3': 12, '4': 1, '5': 11, '6': '.EncryptedContent.Reaction', '9': 10, '10': 'reaction', '17': true},
+      '1': 'isDirectChat',
-    {'1': 'textMessage', '3': 13, '4': 1, '5': 11, '6': '.EncryptedContent.TextMessage', '9': 11, '10': 'textMessage', '17': true},
+      '3': 3,
-    {'1': 'groupCreate', '3': 14, '4': 1, '5': 11, '6': '.EncryptedContent.GroupCreate', '9': 12, '10': 'groupCreate', '17': true},
+      '4': 1,
-    {'1': 'groupJoin', '3': 15, '4': 1, '5': 11, '6': '.EncryptedContent.GroupJoin', '9': 13, '10': 'groupJoin', '17': true},
+      '5': 8,
-    {'1': 'groupUpdate', '3': 16, '4': 1, '5': 11, '6': '.EncryptedContent.GroupUpdate', '9': 14, '10': 'groupUpdate', '17': true},
+      '9': 1,
-    {'1': 'resendGroupPublicKey', '3': 17, '4': 1, '5': 11, '6': '.EncryptedContent.ResendGroupPublicKey', '9': 15, '10': 'resendGroupPublicKey', '17': true},
+      '10': 'isDirectChat',
+      '17': true
+    },
+    {
+      '1': 'senderProfileCounter',
+      '3': 4,
+      '4': 1,
+      '5': 3,
+      '9': 2,
+      '10': 'senderProfileCounter',
+      '17': true
+    },
+    {
+      '1': 'messageUpdate',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.MessageUpdate',
+      '9': 3,
+      '10': 'messageUpdate',
+      '17': true
+    },
+    {
+      '1': 'media',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.Media',
+      '9': 4,
+      '10': 'media',
+      '17': true
+    },
+    {
+      '1': 'mediaUpdate',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.MediaUpdate',
+      '9': 5,
+      '10': 'mediaUpdate',
+      '17': true
+    },
+    {
+      '1': 'contactUpdate',
+      '3': 8,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.ContactUpdate',
+      '9': 6,
+      '10': 'contactUpdate',
+      '17': true
+    },
+    {
+      '1': 'contactRequest',
+      '3': 9,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.ContactRequest',
+      '9': 7,
+      '10': 'contactRequest',
+      '17': true
+    },
+    {
+      '1': 'flameSync',
+      '3': 10,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.FlameSync',
+      '9': 8,
+      '10': 'flameSync',
+      '17': true
+    },
+    {
+      '1': 'pushKeys',
+      '3': 11,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.PushKeys',
+      '9': 9,
+      '10': 'pushKeys',
+      '17': true
+    },
+    {
+      '1': 'reaction',
+      '3': 12,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.Reaction',
+      '9': 10,
+      '10': 'reaction',
+      '17': true
+    },
+    {
+      '1': 'textMessage',
+      '3': 13,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.TextMessage',
+      '9': 11,
+      '10': 'textMessage',
+      '17': true
+    },
+    {
+      '1': 'groupCreate',
+      '3': 14,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.GroupCreate',
+      '9': 12,
+      '10': 'groupCreate',
+      '17': true
+    },
+    {
+      '1': 'groupJoin',
+      '3': 15,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.GroupJoin',
+      '9': 13,
+      '10': 'groupJoin',
+      '17': true
+    },
+    {
+      '1': 'groupUpdate',
+      '3': 16,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.GroupUpdate',
+      '9': 14,
+      '10': 'groupUpdate',
+      '17': true
+    },
+    {
+      '1': 'resendGroupPublicKey',
+      '3': 17,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.ResendGroupPublicKey',
+      '9': 15,
+      '10': 'resendGroupPublicKey',
+      '17': true
+    },
+  ],
+  '3': [
+    EncryptedContent_GroupCreate$json,
+    EncryptedContent_GroupJoin$json,
+    EncryptedContent_ResendGroupPublicKey$json,
+    EncryptedContent_GroupUpdate$json,
+    EncryptedContent_TextMessage$json,
+    EncryptedContent_Reaction$json,
+    EncryptedContent_MessageUpdate$json,
+    EncryptedContent_Media$json,
+    EncryptedContent_MediaUpdate$json,
+    EncryptedContent_ContactRequest$json,
+    EncryptedContent_ContactUpdate$json,
+    EncryptedContent_PushKeys$json,
+    EncryptedContent_FlameSync$json
   ],
-  '3': [EncryptedContent_GroupCreate$json, EncryptedContent_GroupJoin$json, EncryptedContent_ResendGroupPublicKey$json, EncryptedContent_GroupUpdate$json, EncryptedContent_TextMessage$json, EncryptedContent_Reaction$json, EncryptedContent_MessageUpdate$json, EncryptedContent_Media$json, EncryptedContent_MediaUpdate$json, EncryptedContent_ContactRequest$json, EncryptedContent_ContactUpdate$json, EncryptedContent_PushKeys$json, EncryptedContent_FlameSync$json],
   '8': [
     {'1': '_groupId'},
     {'1': '_isDirectChat'},
@@ -168,9 +369,33 @@ const EncryptedContent_GroupUpdate$json = {
   '1': 'GroupUpdate',
   '2': [
     {'1': 'groupActionType', '3': 1, '4': 1, '5': 9, '10': 'groupActionType'},
-    {'1': 'affectedContactId', '3': 2, '4': 1, '5': 3, '9': 0, '10': 'affectedContactId', '17': true},
+    {
-    {'1': 'newGroupName', '3': 3, '4': 1, '5': 9, '9': 1, '10': 'newGroupName', '17': true},
+      '1': 'affectedContactId',
-    {'1': 'newDeleteMessagesAfterMilliseconds', '3': 4, '4': 1, '5': 3, '9': 2, '10': 'newDeleteMessagesAfterMilliseconds', '17': true},
+      '3': 2,
+      '4': 1,
+      '5': 3,
+      '9': 0,
+      '10': 'affectedContactId',
+      '17': true
+    },
+    {
+      '1': 'newGroupName',
+      '3': 3,
+      '4': 1,
+      '5': 9,
+      '9': 1,
+      '10': 'newGroupName',
+      '17': true
+    },
+    {
+      '1': 'newDeleteMessagesAfterMilliseconds',
+      '3': 4,
+      '4': 1,
+      '5': 3,
+      '9': 2,
+      '10': 'newDeleteMessagesAfterMilliseconds',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_affectedContactId'},
@@ -186,7 +411,15 @@ const EncryptedContent_TextMessage$json = {
     {'1': 'senderMessageId', '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', '3': 4, '4': 1, '5': 9, '9': 0, '10': 'quoteMessageId', '17': true},
+    {
+      '1': 'quoteMessageId',
+      '3': 4,
+      '4': 1,
+      '5': 9,
+      '9': 0,
+      '10': 'quoteMessageId',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_quoteMessageId'},
@@ -207,9 +440,30 @@ const EncryptedContent_Reaction$json = {
 const EncryptedContent_MessageUpdate$json = {
   '1': 'MessageUpdate',
   '2': [
-    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.EncryptedContent.MessageUpdate.Type', '10': 'type'},
+    {
-    {'1': 'senderMessageId', '3': 2, '4': 1, '5': 9, '9': 0, '10': 'senderMessageId', '17': true},
+      '1': 'type',
-    {'1': 'multipleTargetMessageIds', '3': 3, '4': 3, '5': 9, '10': 'multipleTargetMessageIds'},
+      '3': 1,
+      '4': 1,
+      '5': 14,
+      '6': '.EncryptedContent.MessageUpdate.Type',
+      '10': 'type'
+    },
+    {
+      '1': 'senderMessageId',
+      '3': 2,
+      '4': 1,
+      '5': 9,
+      '9': 0,
+      '10': 'senderMessageId',
+      '17': true
+    },
+    {
+      '1': 'multipleTargetMessageIds',
+      '3': 3,
+      '4': 3,
+      '5': 9,
+      '10': 'multipleTargetMessageIds'
+    },
     {'1': 'text', '3': 4, '4': 1, '5': 9, '9': 1, '10': 'text', '17': true},
     {'1': 'timestamp', '3': 5, '4': 1, '5': 3, '10': 'timestamp'},
   ],
@@ -235,15 +489,76 @@ const EncryptedContent_Media$json = {
   '1': 'Media',
   '2': [
     {'1': 'senderMessageId', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
-    {'1': 'type', '3': 2, '4': 1, '5': 14, '6': '.EncryptedContent.Media.Type', '10': 'type'},
+    {
-    {'1': 'displayLimitInMilliseconds', '3': 3, '4': 1, '5': 3, '9': 0, '10': 'displayLimitInMilliseconds', '17': true},
+      '1': 'type',
-    {'1': 'requiresAuthentication', '3': 4, '4': 1, '5': 8, '10': 'requiresAuthentication'},
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.EncryptedContent.Media.Type',
+      '10': 'type'
+    },
+    {
+      '1': 'displayLimitInMilliseconds',
+      '3': 3,
+      '4': 1,
+      '5': 3,
+      '9': 0,
+      '10': 'displayLimitInMilliseconds',
+      '17': true
+    },
+    {
+      '1': 'requiresAuthentication',
+      '3': 4,
+      '4': 1,
+      '5': 8,
+      '10': 'requiresAuthentication'
+    },
     {'1': 'timestamp', '3': 5, '4': 1, '5': 3, '10': 'timestamp'},
-    {'1': 'quoteMessageId', '3': 6, '4': 1, '5': 9, '9': 1, '10': 'quoteMessageId', '17': true},
+    {
-    {'1': 'downloadToken', '3': 7, '4': 1, '5': 12, '9': 2, '10': 'downloadToken', '17': true},
+      '1': 'quoteMessageId',
-    {'1': 'encryptionKey', '3': 8, '4': 1, '5': 12, '9': 3, '10': 'encryptionKey', '17': true},
+      '3': 6,
-    {'1': 'encryptionMac', '3': 9, '4': 1, '5': 12, '9': 4, '10': 'encryptionMac', '17': true},
+      '4': 1,
-    {'1': 'encryptionNonce', '3': 10, '4': 1, '5': 12, '9': 5, '10': 'encryptionNonce', '17': true},
+      '5': 9,
+      '9': 1,
+      '10': 'quoteMessageId',
+      '17': true
+    },
+    {
+      '1': 'downloadToken',
+      '3': 7,
+      '4': 1,
+      '5': 12,
+      '9': 2,
+      '10': 'downloadToken',
+      '17': true
+    },
+    {
+      '1': 'encryptionKey',
+      '3': 8,
+      '4': 1,
+      '5': 12,
+      '9': 3,
+      '10': 'encryptionKey',
+      '17': true
+    },
+    {
+      '1': 'encryptionMac',
+      '3': 9,
+      '4': 1,
+      '5': 12,
+      '9': 4,
+      '10': 'encryptionMac',
+      '17': true
+    },
+    {
+      '1': 'encryptionNonce',
+      '3': 10,
+      '4': 1,
+      '5': 12,
+      '9': 5,
+      '10': 'encryptionNonce',
+      '17': true
+    },
   ],
   '4': [EncryptedContent_Media_Type$json],
   '8': [
@@ -272,7 +587,14 @@ const EncryptedContent_Media_Type$json = {
 const EncryptedContent_MediaUpdate$json = {
   '1': 'MediaUpdate',
   '2': [
-    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.EncryptedContent.MediaUpdate.Type', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 1,
+      '4': 1,
+      '5': 14,
+      '6': '.EncryptedContent.MediaUpdate.Type',
+      '10': 'type'
+    },
     {'1': 'targetMessageId', '3': 2, '4': 1, '5': 9, '10': 'targetMessageId'},
   ],
   '4': [EncryptedContent_MediaUpdate_Type$json],
@@ -292,7 +614,14 @@ const EncryptedContent_MediaUpdate_Type$json = {
 const EncryptedContent_ContactRequest$json = {
   '1': 'ContactRequest',
   '2': [
-    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.EncryptedContent.ContactRequest.Type', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 1,
+      '4': 1,
+      '5': 14,
+      '6': '.EncryptedContent.ContactRequest.Type',
+      '10': 'type'
+    },
   ],
   '4': [EncryptedContent_ContactRequest_Type$json],
 };
@@ -311,10 +640,41 @@ const EncryptedContent_ContactRequest_Type$json = {
 const EncryptedContent_ContactUpdate$json = {
   '1': 'ContactUpdate',
   '2': [
-    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.EncryptedContent.ContactUpdate.Type', '10': 'type'},
+    {
-    {'1': 'avatarSvgCompressed', '3': 2, '4': 1, '5': 12, '9': 0, '10': 'avatarSvgCompressed', '17': true},
+      '1': 'type',
-    {'1': 'username', '3': 3, '4': 1, '5': 9, '9': 1, '10': 'username', '17': true},
+      '3': 1,
-    {'1': 'displayName', '3': 4, '4': 1, '5': 9, '9': 2, '10': 'displayName', '17': true},
+      '4': 1,
+      '5': 14,
+      '6': '.EncryptedContent.ContactUpdate.Type',
+      '10': 'type'
+    },
+    {
+      '1': 'avatarSvgCompressed',
+      '3': 2,
+      '4': 1,
+      '5': 12,
+      '9': 0,
+      '10': 'avatarSvgCompressed',
+      '17': true
+    },
+    {
+      '1': 'username',
+      '3': 3,
+      '4': 1,
+      '5': 9,
+      '9': 1,
+      '10': 'username',
+      '17': true
+    },
+    {
+      '1': 'displayName',
+      '3': 4,
+      '4': 1,
+      '5': 9,
+      '9': 2,
+      '10': 'displayName',
+      '17': true
+    },
   ],
   '4': [EncryptedContent_ContactUpdate_Type$json],
   '8': [
@@ -337,10 +697,25 @@ const EncryptedContent_ContactUpdate_Type$json = {
 const EncryptedContent_PushKeys$json = {
   '1': 'PushKeys',
   '2': [
-    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.EncryptedContent.PushKeys.Type', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 1,
+      '4': 1,
+      '5': 14,
+      '6': '.EncryptedContent.PushKeys.Type',
+      '10': 'type'
+    },
     {'1': 'keyId', '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', '3': 4, '4': 1, '5': 3, '9': 2, '10': 'createdAt', '17': true},
+    {
+      '1': 'createdAt',
+      '3': 4,
+      '4': 1,
+      '5': 3,
+      '9': 2,
+      '10': 'createdAt',
+      '17': true
+    },
   ],
   '4': [EncryptedContent_PushKeys_Type$json],
   '8': [
@@ -364,7 +739,13 @@ const EncryptedContent_FlameSync$json = {
   '1': 'FlameSync',
   '2': [
     {'1': 'flameCounter', '3': 1, '4': 1, '5': 3, '10': 'flameCounter'},
-    {'1': 'lastFlameCounterChange', '3': 2, '4': 1, '5': 3, '10': 'lastFlameCounterChange'},
+    {
+      '1': 'lastFlameCounterChange',
+      '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'},
   ],
@@ -445,4 +826,3 @@ final $typed_data.Uint8List encryptedContentDescriptor = $convert.base64Decode(
     'dEIMCgpfZmxhbWVTeW5jQgsKCV9wdXNoS2V5c0ILCglfcmVhY3Rpb25CDgoMX3RleHRNZXNzYW'
     'dlQg4KDF9ncm91cENyZWF0ZUIMCgpfZ3JvdXBKb2luQg4KDF9ncm91cFVwZGF0ZUIXChVfcmVz'
     'ZW5kR3JvdXBQdWJsaWNLZXk=');
-

lib/src/model/protobuf/client/generated/push_notification.pb.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from push_notification.proto.
-//  source: push_notification.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 import 'dart:core' as $core;
 
@@ -16,6 +17,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'push_notification.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'push_notification.pbenum.dart';
 
 class EncryptedPushNotification extends $pb.GeneratedMessage {
@@ -25,89 +28,93 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
     $core.List<$core.int>? ciphertext,
     $core.List<$core.int>? mac,
   }) {
-    final $result = create();
+    final result = create();
-    if (keyId != null) {
+    if (keyId != null) result.keyId = keyId;
-      $result.keyId = keyId;
+    if (nonce != null) result.nonce = nonce;
-    }
+    if (ciphertext != null) result.ciphertext = ciphertext;
-    if (nonce != null) {
+    if (mac != null) result.mac = mac;
-      $result.nonce = nonce;
+    return result;
-    }
-    if (ciphertext != null) {
-      $result.ciphertext = ciphertext;
-    }
-    if (mac != null) {
-      $result.mac = mac;
-    }
-    return $result;
   }
-  EncryptedPushNotification._() : super();
-  factory EncryptedPushNotification.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EncryptedPushNotification.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EncryptedPushNotification', createEmptyInstance: create)
+  EncryptedPushNotification._();
+
+  factory EncryptedPushNotification.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EncryptedPushNotification.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedPushNotification',
+      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'keyId', protoName: 'keyId')
-    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
-    ..a<$core.List<$core.int>>(3, _omitFieldNames ? '' : 'ciphertext', $pb.PbFieldType.OY)
+        2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(4, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
-    ..hasRequiredFields = false
+        3, _omitFieldNames ? '' : 'ciphertext', $pb.PbFieldType.OY)
-  ;
+    ..a<$core.List<$core.int>>(
+        4, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
+  EncryptedPushNotification clone() =>
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      EncryptedPushNotification()..mergeFromMessage(this);
-  'Will be removed in next major version')
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedPushNotification clone() => EncryptedPushNotification()..mergeFromMessage(this);
+  EncryptedPushNotification copyWith(
-  @$core.Deprecated(
+          void Function(EncryptedPushNotification) updates) =>
-  'Using this can add significant overhead to your binary. '
+      super.copyWith((message) => updates(message as EncryptedPushNotification))
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+          as EncryptedPushNotification;
-  'Will be removed in next major version')
-  EncryptedPushNotification copyWith(void Function(EncryptedPushNotification) updates) => super.copyWith((message) => updates(message as EncryptedPushNotification)) as EncryptedPushNotification;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static EncryptedPushNotification create() => EncryptedPushNotification._();
+  @$core.override
   EncryptedPushNotification createEmptyInstance() => create();
-  static $pb.PbList<EncryptedPushNotification> createRepeated() => $pb.PbList<EncryptedPushNotification>();
+  static $pb.PbList<EncryptedPushNotification> createRepeated() =>
+      $pb.PbList<EncryptedPushNotification>();
   @$core.pragma('dart2js:noInline')
-  static EncryptedPushNotification getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EncryptedPushNotification>(create);
+  static EncryptedPushNotification getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EncryptedPushNotification>(create);
   static EncryptedPushNotification? _defaultInstance;
 
   @$pb.TagNumber(1)
   $fixnum.Int64 get keyId => $_getI64(0);
   @$pb.TagNumber(1)
-  set keyId($fixnum.Int64 v) { $_setInt64(0, v); }
+  set keyId($fixnum.Int64 value) => $_setInt64(0, value);
   @$pb.TagNumber(1)
   $core.bool hasKeyId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKeyId() => clearField(1);
+  void clearKeyId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.List<$core.int> get nonce => $_getN(1);
   @$pb.TagNumber(2)
-  set nonce($core.List<$core.int> v) { $_setBytes(1, v); }
+  set nonce($core.List<$core.int> value) => $_setBytes(1, value);
   @$pb.TagNumber(2)
   $core.bool hasNonce() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNonce() => clearField(2);
+  void clearNonce() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.List<$core.int> get ciphertext => $_getN(2);
   @$pb.TagNumber(3)
-  set ciphertext($core.List<$core.int> v) { $_setBytes(2, v); }
+  set ciphertext($core.List<$core.int> value) => $_setBytes(2, value);
   @$pb.TagNumber(3)
   $core.bool hasCiphertext() => $_has(2);
   @$pb.TagNumber(3)
-  void clearCiphertext() => clearField(3);
+  void clearCiphertext() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.List<$core.int> get mac => $_getN(3);
   @$pb.TagNumber(4)
-  set mac($core.List<$core.int> v) { $_setBytes(3, v); }
+  set mac($core.List<$core.int> value) => $_setBytes(3, value);
   @$pb.TagNumber(4)
   $core.bool hasMac() => $_has(3);
   @$pb.TagNumber(4)
-  void clearMac() => clearField(4);
+  void clearMac() => $_clearField(4);
 }
 
 class PushNotification extends $pb.GeneratedMessage {
@@ -116,120 +123,129 @@ class PushNotification extends $pb.GeneratedMessage {
     $core.String? messageId,
     $core.String? additionalContent,
   }) {
-    final $result = create();
+    final result = create();
-    if (kind != null) {
+    if (kind != null) result.kind = kind;
-      $result.kind = kind;
+    if (messageId != null) result.messageId = messageId;
-    }
+    if (additionalContent != null) result.additionalContent = additionalContent;
-    if (messageId != null) {
+    return result;
-      $result.messageId = messageId;
-    }
-    if (additionalContent != null) {
-      $result.additionalContent = additionalContent;
-    }
-    return $result;
   }
-  PushNotification._() : super();
-  factory PushNotification.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PushNotification.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PushNotification', createEmptyInstance: create)
+  PushNotification._();
-    ..e<PushKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE, defaultOrMaker: PushKind.reaction, valueOf: PushKind.valueOf, enumValues: PushKind.values)
+
+  factory PushNotification.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory PushNotification.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PushNotification',
+      createEmptyInstance: create)
+    ..e<PushKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE,
+        defaultOrMaker: PushKind.reaction,
+        valueOf: PushKind.valueOf,
+        enumValues: PushKind.values)
     ..aOS(2, _omitFieldNames ? '' : 'messageId', protoName: 'messageId')
-    ..aOS(3, _omitFieldNames ? '' : 'additionalContent', protoName: 'additionalContent')
+    ..aOS(3, _omitFieldNames ? '' : 'additionalContent',
-    ..hasRequiredFields = false
+        protoName: 'additionalContent')
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
   PushNotification clone() => PushNotification()..mergeFromMessage(this);
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
+  PushNotification copyWith(void Function(PushNotification) updates) =>
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      super.copyWith((message) => updates(message as PushNotification))
-  'Will be removed in next major version')
+          as PushNotification;
-  PushNotification copyWith(void Function(PushNotification) updates) => super.copyWith((message) => updates(message as PushNotification)) as PushNotification;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static PushNotification create() => PushNotification._();
+  @$core.override
   PushNotification createEmptyInstance() => create();
-  static $pb.PbList<PushNotification> createRepeated() => $pb.PbList<PushNotification>();
+  static $pb.PbList<PushNotification> createRepeated() =>
+      $pb.PbList<PushNotification>();
   @$core.pragma('dart2js:noInline')
-  static PushNotification getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushNotification>(create);
+  static PushNotification getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PushNotification>(create);
   static PushNotification? _defaultInstance;
 
   @$pb.TagNumber(1)
   PushKind get kind => $_getN(0);
   @$pb.TagNumber(1)
-  set kind(PushKind v) { setField(1, v); }
+  set kind(PushKind value) => $_setField(1, value);
   @$pb.TagNumber(1)
   $core.bool hasKind() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKind() => clearField(1);
+  void clearKind() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get messageId => $_getSZ(1);
   @$pb.TagNumber(2)
-  set messageId($core.String v) { $_setString(1, v); }
+  set messageId($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasMessageId() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMessageId() => clearField(2);
+  void clearMessageId() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get additionalContent => $_getSZ(2);
   @$pb.TagNumber(3)
-  set additionalContent($core.String v) { $_setString(2, v); }
+  set additionalContent($core.String value) => $_setString(2, value);
   @$pb.TagNumber(3)
   $core.bool hasAdditionalContent() => $_has(2);
   @$pb.TagNumber(3)
-  void clearAdditionalContent() => clearField(3);
+  void clearAdditionalContent() => $_clearField(3);
 }
 
 class PushUsers extends $pb.GeneratedMessage {
   factory PushUsers({
     $core.Iterable<PushUser>? users,
   }) {
-    final $result = create();
+    final result = create();
-    if (users != null) {
+    if (users != null) result.users.addAll(users);
-      $result.users.addAll(users);
+    return result;
-    }
-    return $result;
   }
-  PushUsers._() : super();
-  factory PushUsers.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PushUsers.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PushUsers', createEmptyInstance: create)
+  PushUsers._();
-    ..pc<PushUser>(1, _omitFieldNames ? '' : 'users', $pb.PbFieldType.PM, subBuilder: PushUser.create)
-    ..hasRequiredFields = false
-  ;
 
-  @$core.Deprecated(
+  factory PushUsers.fromBuffer($core.List<$core.int> data,
-  'Using this can add significant overhead to your binary. '
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      create()..mergeFromBuffer(data, registry);
-  'Will be removed in next major version')
+  factory PushUsers.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PushUsers',
+      createEmptyInstance: create)
+    ..pc<PushUser>(1, _omitFieldNames ? '' : 'users', $pb.PbFieldType.PM,
+        subBuilder: PushUser.create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushUsers clone() => PushUsers()..mergeFromMessage(this);
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
+  PushUsers copyWith(void Function(PushUsers) updates) =>
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      super.copyWith((message) => updates(message as PushUsers)) as PushUsers;
-  'Will be removed in next major version')
-  PushUsers copyWith(void Function(PushUsers) updates) => super.copyWith((message) => updates(message as PushUsers)) as PushUsers;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static PushUsers create() => PushUsers._();
+  @$core.override
   PushUsers createEmptyInstance() => create();
   static $pb.PbList<PushUsers> createRepeated() => $pb.PbList<PushUsers>();
   @$core.pragma('dart2js:noInline')
-  static PushUsers getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUsers>(create);
+  static PushUsers getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUsers>(create);
   static PushUsers? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<PushUser> get users => $_getList(0);
+  $pb.PbList<PushUser> get users => $_getList(0);
 }
 
 class PushUser extends $pb.GeneratedMessage {
@@ -240,96 +256,92 @@ class PushUser extends $pb.GeneratedMessage {
     $core.String? lastMessageId,
     $core.Iterable<PushKey>? pushKeys,
   }) {
-    final $result = create();
+    final result = create();
-    if (userId != null) {
+    if (userId != null) result.userId = userId;
-      $result.userId = userId;
+    if (displayName != null) result.displayName = displayName;
-    }
+    if (blocked != null) result.blocked = blocked;
-    if (displayName != null) {
+    if (lastMessageId != null) result.lastMessageId = lastMessageId;
-      $result.displayName = displayName;
+    if (pushKeys != null) result.pushKeys.addAll(pushKeys);
-    }
+    return result;
-    if (blocked != null) {
-      $result.blocked = blocked;
-    }
-    if (lastMessageId != null) {
-      $result.lastMessageId = lastMessageId;
-    }
-    if (pushKeys != null) {
-      $result.pushKeys.addAll(pushKeys);
-    }
-    return $result;
   }
-  PushUser._() : super();
-  factory PushUser.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PushUser.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PushUser', createEmptyInstance: create)
+  PushUser._();
+
+  factory PushUser.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory PushUser.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PushUser',
+      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'userId', protoName: 'userId')
     ..aOS(2, _omitFieldNames ? '' : 'displayName', protoName: 'displayName')
     ..aOB(3, _omitFieldNames ? '' : 'blocked')
     ..aOS(4, _omitFieldNames ? '' : 'lastMessageId', protoName: 'lastMessageId')
-    ..pc<PushKey>(5, _omitFieldNames ? '' : 'pushKeys', $pb.PbFieldType.PM, protoName: 'pushKeys', subBuilder: PushKey.create)
+    ..pc<PushKey>(5, _omitFieldNames ? '' : 'pushKeys', $pb.PbFieldType.PM,
-    ..hasRequiredFields = false
+        protoName: 'pushKeys', subBuilder: PushKey.create)
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
   PushUser clone() => PushUser()..mergeFromMessage(this);
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
+  PushUser copyWith(void Function(PushUser) updates) =>
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      super.copyWith((message) => updates(message as PushUser)) as PushUser;
-  'Will be removed in next major version')
-  PushUser copyWith(void Function(PushUser) updates) => super.copyWith((message) => updates(message as PushUser)) as PushUser;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static PushUser create() => PushUser._();
+  @$core.override
   PushUser createEmptyInstance() => create();
   static $pb.PbList<PushUser> createRepeated() => $pb.PbList<PushUser>();
   @$core.pragma('dart2js:noInline')
-  static PushUser getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUser>(create);
+  static PushUser getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUser>(create);
   static PushUser? _defaultInstance;
 
   @$pb.TagNumber(1)
   $fixnum.Int64 get userId => $_getI64(0);
   @$pb.TagNumber(1)
-  set userId($fixnum.Int64 v) { $_setInt64(0, v); }
+  set userId($fixnum.Int64 value) => $_setInt64(0, value);
   @$pb.TagNumber(1)
   $core.bool hasUserId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearUserId() => clearField(1);
+  void clearUserId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get displayName => $_getSZ(1);
   @$pb.TagNumber(2)
-  set displayName($core.String v) { $_setString(1, v); }
+  set displayName($core.String value) => $_setString(1, value);
   @$pb.TagNumber(2)
   $core.bool hasDisplayName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDisplayName() => clearField(2);
+  void clearDisplayName() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.bool get blocked => $_getBF(2);
   @$pb.TagNumber(3)
-  set blocked($core.bool v) { $_setBool(2, v); }
+  set blocked($core.bool value) => $_setBool(2, value);
   @$pb.TagNumber(3)
   $core.bool hasBlocked() => $_has(2);
   @$pb.TagNumber(3)
-  void clearBlocked() => clearField(3);
+  void clearBlocked() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get lastMessageId => $_getSZ(3);
   @$pb.TagNumber(4)
-  set lastMessageId($core.String v) { $_setString(3, v); }
+  set lastMessageId($core.String value) => $_setString(3, value);
   @$pb.TagNumber(4)
   $core.bool hasLastMessageId() => $_has(3);
   @$pb.TagNumber(4)
-  void clearLastMessageId() => clearField(4);
+  void clearLastMessageId() => $_clearField(4);
 
   @$pb.TagNumber(5)
-  $core.List<PushKey> get pushKeys => $_getList(4);
+  $pb.PbList<PushKey> get pushKeys => $_getList(4);
 }
 
 class PushKey extends $pb.GeneratedMessage {
@@ -338,78 +350,81 @@ class PushKey extends $pb.GeneratedMessage {
     $core.List<$core.int>? key,
     $fixnum.Int64? createdAtUnixTimestamp,
   }) {
-    final $result = create();
+    final result = create();
-    if (id != null) {
+    if (id != null) result.id = id;
-      $result.id = id;
+    if (key != null) result.key = key;
-    }
+    if (createdAtUnixTimestamp != null)
-    if (key != null) {
+      result.createdAtUnixTimestamp = createdAtUnixTimestamp;
-      $result.key = key;
+    return result;
-    }
-    if (createdAtUnixTimestamp != null) {
-      $result.createdAtUnixTimestamp = createdAtUnixTimestamp;
-    }
-    return $result;
   }
-  PushKey._() : super();
-  factory PushKey.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PushKey.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PushKey', createEmptyInstance: create)
+  PushKey._();
+
+  factory PushKey.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory PushKey.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PushKey',
+      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'id')
-    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
-    ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp', protoName: 'createdAtUnixTimestamp')
+        2, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
-    ..hasRequiredFields = false
+    ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp',
-  ;
+        protoName: 'createdAtUnixTimestamp')
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
   PushKey clone() => PushKey()..mergeFromMessage(this);
-  @$core.Deprecated(
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  'Using this can add significant overhead to your binary. '
+  PushKey copyWith(void Function(PushKey) updates) =>
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      super.copyWith((message) => updates(message as PushKey)) as PushKey;
-  'Will be removed in next major version')
-  PushKey copyWith(void Function(PushKey) updates) => super.copyWith((message) => updates(message as PushKey)) as PushKey;
 
+  @$core.override
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static PushKey create() => PushKey._();
+  @$core.override
   PushKey createEmptyInstance() => create();
   static $pb.PbList<PushKey> createRepeated() => $pb.PbList<PushKey>();
   @$core.pragma('dart2js:noInline')
-  static PushKey getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushKey>(create);
+  static PushKey getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushKey>(create);
   static PushKey? _defaultInstance;
 
   @$pb.TagNumber(1)
   $fixnum.Int64 get id => $_getI64(0);
   @$pb.TagNumber(1)
-  set id($fixnum.Int64 v) { $_setInt64(0, v); }
+  set id($fixnum.Int64 value) => $_setInt64(0, value);
   @$pb.TagNumber(1)
   $core.bool hasId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearId() => clearField(1);
+  void clearId() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.List<$core.int> get key => $_getN(1);
   @$pb.TagNumber(2)
-  set key($core.List<$core.int> v) { $_setBytes(1, v); }
+  set key($core.List<$core.int> value) => $_setBytes(1, value);
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $fixnum.Int64 get createdAtUnixTimestamp => $_getI64(2);
   @$pb.TagNumber(3)
-  set createdAtUnixTimestamp($fixnum.Int64 v) { $_setInt64(2, v); }
+  set createdAtUnixTimestamp($fixnum.Int64 value) => $_setInt64(2, value);
   @$pb.TagNumber(3)
   $core.bool hasCreatedAtUnixTimestamp() => $_has(2);
   @$pb.TagNumber(3)
-  void clearCreatedAtUnixTimestamp() => clearField(3);
+  void clearCreatedAtUnixTimestamp() => $_clearField(3);
 }
 
-
+const $core.bool _omitFieldNames =
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/src/model/protobuf/client/generated/push_notification.pbenum.dart

@@ -1,38 +1,51 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from push_notification.proto.
-//  source: push_notification.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
 
 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 reaction =
-  static const PushKind response = PushKind._(1, _omitEnumNames ? '' : 'response');
+      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 contactRequest =
-  static const PushKind acceptRequest = PushKind._(7, _omitEnumNames ? '' : 'acceptRequest');
+      PushKind._(6, _omitEnumNames ? '' : 'contactRequest');
-  static const PushKind storedMediaFile = PushKind._(8, _omitEnumNames ? '' : 'storedMediaFile');
+  static const PushKind acceptRequest =
-  static const PushKind testNotification = PushKind._(9, _omitEnumNames ? '' : 'testNotification');
+      PushKind._(7, _omitEnumNames ? '' : 'acceptRequest');
-  static const PushKind reopenedMedia = PushKind._(10, _omitEnumNames ? '' : 'reopenedMedia');
+  static const PushKind storedMediaFile =
-  static const PushKind reactionToVideo = PushKind._(11, _omitEnumNames ? '' : 'reactionToVideo');
+      PushKind._(8, _omitEnumNames ? '' : 'storedMediaFile');
-  static const PushKind reactionToText = PushKind._(12, _omitEnumNames ? '' : 'reactionToText');
+  static const PushKind testNotification =
-  static const PushKind reactionToImage = PushKind._(13, _omitEnumNames ? '' : 'reactionToImage');
+      PushKind._(9, _omitEnumNames ? '' : 'testNotification');
-  static const PushKind reactionToAudio = PushKind._(14, _omitEnumNames ? '' : 'reactionToAudio');
+  static const PushKind reopenedMedia =
-  static const PushKind addedToGroup = PushKind._(15, _omitEnumNames ? '' : 'addedToGroup');
+      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 $core.List<PushKind> values = <PushKind> [
+  static const $core.List<PushKind> values = <PushKind>[
     reaction,
     response,
     text,
@@ -52,11 +65,13 @@ class PushKind extends $pb.ProtobufEnum {
     audio,
   ];
 
-  static final $core.Map<$core.int, PushKind> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.List<PushKind?> _byValue =
-  static PushKind? valueOf($core.int value) => _byValue[value];
+      $pb.ProtobufEnum.$_initByValueList(values, 16);
+  static PushKind? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
 
-  const PushKind._($core.int v, $core.String n) : super(v, n);
+  const PushKind._(super.value, super.name);
 }
 
-
+const $core.bool _omitEnumNames =
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+    $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/src/model/protobuf/client/generated/push_notification.pbjson.dart

@@ -1,13 +1,14 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
+// Generated from push_notification.proto.
-//  source: push_notification.proto
+
-//
+// @dart = 3.3
-// @dart = 2.12
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: constant_identifier_names
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -68,8 +69,24 @@ const PushNotification$json = {
   '1': 'PushNotification',
   '2': [
     {'1': 'kind', '3': 1, '4': 1, '5': 14, '6': '.PushKind', '10': 'kind'},
-    {'1': 'messageId', '3': 2, '4': 1, '5': 9, '9': 0, '10': 'messageId', '17': true},
+    {
-    {'1': 'additionalContent', '3': 3, '4': 1, '5': 9, '9': 1, '10': 'additionalContent', '17': true},
+      '1': 'messageId',
+      '3': 2,
+      '4': 1,
+      '5': 9,
+      '9': 0,
+      '10': 'messageId',
+      '17': true
+    },
+    {
+      '1': 'additionalContent',
+      '3': 3,
+      '4': 1,
+      '5': 9,
+      '9': 1,
+      '10': 'additionalContent',
+      '17': true
+    },
   ],
   '8': [
     {'1': '_messageId'},
@@ -103,8 +120,23 @@ const PushUser$json = {
     {'1': 'userId', '3': 1, '4': 1, '5': 3, '10': 'userId'},
     {'1': 'displayName', '3': 2, '4': 1, '5': 9, '10': 'displayName'},
     {'1': 'blocked', '3': 3, '4': 1, '5': 8, '10': 'blocked'},
-    {'1': 'lastMessageId', '3': 4, '4': 1, '5': 9, '9': 0, '10': 'lastMessageId', '17': true},
+    {
-    {'1': 'pushKeys', '3': 5, '4': 3, '5': 11, '6': '.PushKey', '10': 'pushKeys'},
+      '1': 'lastMessageId',
+      '3': 4,
+      '4': 1,
+      '5': 9,
+      '9': 0,
+      '10': 'lastMessageId',
+      '17': true
+    },
+    {
+      '1': 'pushKeys',
+      '3': 5,
+      '4': 3,
+      '5': 11,
+      '6': '.PushKey',
+      '10': 'pushKeys'
+    },
   ],
   '8': [
     {'1': '_lastMessageId'},
@@ -124,7 +156,13 @@ const PushKey$json = {
   '2': [
     {'1': 'id', '3': 1, '4': 1, '5': 3, '10': 'id'},
     {'1': 'key', '3': 2, '4': 1, '5': 12, '10': 'key'},
-    {'1': 'createdAtUnixTimestamp', '3': 3, '4': 1, '5': 3, '10': 'createdAtUnixTimestamp'},
+    {
+      '1': 'createdAtUnixTimestamp',
+      '3': 3,
+      '4': 1,
+      '5': 3,
+      '10': 'createdAtUnixTimestamp'
+    },
   ],
 };
 
@@ -132,4 +170,3 @@ const PushKey$json = {
 final $typed_data.Uint8List pushKeyDescriptor = $convert.base64Decode(
     'CgdQdXNoS2V5Eg4KAmlkGAEgASgDUgJpZBIQCgNrZXkYAiABKAxSA2tleRI2ChZjcmVhdGVkQX'
     'RVbml4VGltZXN0YW1wGAMgASgDUhZjcmVhdGVkQXRVbml4VGltZXN0YW1w');
-

lib/src/model/protobuf/client/generated/qr.pb.dart

@@ -0,0 +1,228 @@
+// This is a generated file - do not edit.
+//
+// Generated from qr.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+
+import 'dart:core' as $core;
+
+import 'package:fixnum/fixnum.dart' as $fixnum;
+import 'package:protobuf/protobuf.dart' as $pb;
+
+import 'qr.pbenum.dart';
+
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
+export 'qr.pbenum.dart';
+
+class QREnvelope extends $pb.GeneratedMessage {
+  factory QREnvelope({
+    QREnvelope_Type? type,
+    $core.List<$core.int>? data,
+  }) {
+    final result = create();
+    if (type != null) result.type = type;
+    if (data != null) result.data = data;
+    return result;
+  }
+
+  QREnvelope._();
+
+  factory QREnvelope.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory QREnvelope.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'QREnvelope',
+      createEmptyInstance: create)
+    ..e<QREnvelope_Type>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
+        defaultOrMaker: QREnvelope_Type.PublicProfile,
+        valueOf: QREnvelope_Type.valueOf,
+        enumValues: QREnvelope_Type.values)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  QREnvelope clone() => QREnvelope()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  QREnvelope copyWith(void Function(QREnvelope) updates) =>
+      super.copyWith((message) => updates(message as QREnvelope)) as QREnvelope;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static QREnvelope create() => QREnvelope._();
+  @$core.override
+  QREnvelope createEmptyInstance() => create();
+  static $pb.PbList<QREnvelope> createRepeated() => $pb.PbList<QREnvelope>();
+  @$core.pragma('dart2js:noInline')
+  static QREnvelope getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<QREnvelope>(create);
+  static QREnvelope? _defaultInstance;
+
+  @$pb.TagNumber(2)
+  QREnvelope_Type get type => $_getN(0);
+  @$pb.TagNumber(2)
+  set type(QREnvelope_Type value) => $_setField(2, value);
+  @$pb.TagNumber(2)
+  $core.bool hasType() => $_has(0);
+  @$pb.TagNumber(2)
+  void clearType() => $_clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.List<$core.int> get data => $_getN(1);
+  @$pb.TagNumber(3)
+  set data($core.List<$core.int> value) => $_setBytes(1, value);
+  @$pb.TagNumber(3)
+  $core.bool hasData() => $_has(1);
+  @$pb.TagNumber(3)
+  void clearData() => $_clearField(3);
+}
+
+class PublicProfile extends $pb.GeneratedMessage {
+  factory PublicProfile({
+    $fixnum.Int64? userId,
+    $core.String? username,
+    $core.List<$core.int>? publicIdentityKey,
+    $core.List<$core.int>? signedPrekey,
+    $fixnum.Int64? registrationId,
+    $core.List<$core.int>? signedPrekeySignature,
+    $fixnum.Int64? signedPrekeyId,
+  }) {
+    final result = create();
+    if (userId != null) result.userId = userId;
+    if (username != null) result.username = username;
+    if (publicIdentityKey != null) result.publicIdentityKey = publicIdentityKey;
+    if (signedPrekey != null) result.signedPrekey = signedPrekey;
+    if (registrationId != null) result.registrationId = registrationId;
+    if (signedPrekeySignature != null)
+      result.signedPrekeySignature = signedPrekeySignature;
+    if (signedPrekeyId != null) result.signedPrekeyId = signedPrekeyId;
+    return result;
+  }
+
+  PublicProfile._();
+
+  factory PublicProfile.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory PublicProfile.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PublicProfile',
+      createEmptyInstance: create)
+    ..aInt64(1, _omitFieldNames ? '' : 'userId')
+    ..aOS(2, _omitFieldNames ? '' : 'username')
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'publicIdentityKey', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        4, _omitFieldNames ? '' : 'signedPrekey', $pb.PbFieldType.OY)
+    ..aInt64(5, _omitFieldNames ? '' : 'registrationId')
+    ..a<$core.List<$core.int>>(
+        6, _omitFieldNames ? '' : 'signedPrekeySignature', $pb.PbFieldType.OY)
+    ..aInt64(7, _omitFieldNames ? '' : 'signedPrekeyId')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  PublicProfile clone() => PublicProfile()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  PublicProfile copyWith(void Function(PublicProfile) updates) =>
+      super.copyWith((message) => updates(message as PublicProfile))
+          as PublicProfile;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PublicProfile create() => PublicProfile._();
+  @$core.override
+  PublicProfile createEmptyInstance() => create();
+  static $pb.PbList<PublicProfile> createRepeated() =>
+      $pb.PbList<PublicProfile>();
+  @$core.pragma('dart2js:noInline')
+  static PublicProfile getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PublicProfile>(create);
+  static PublicProfile? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $fixnum.Int64 get userId => $_getI64(0);
+  @$pb.TagNumber(1)
+  set userId($fixnum.Int64 value) => $_setInt64(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasUserId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearUserId() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get username => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set username($core.String value) => $_setString(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasUsername() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearUsername() => $_clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.List<$core.int> get publicIdentityKey => $_getN(2);
+  @$pb.TagNumber(3)
+  set publicIdentityKey($core.List<$core.int> value) => $_setBytes(2, value);
+  @$pb.TagNumber(3)
+  $core.bool hasPublicIdentityKey() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearPublicIdentityKey() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.List<$core.int> get signedPrekey => $_getN(3);
+  @$pb.TagNumber(4)
+  set signedPrekey($core.List<$core.int> value) => $_setBytes(3, value);
+  @$pb.TagNumber(4)
+  $core.bool hasSignedPrekey() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSignedPrekey() => $_clearField(4);
+
+  @$pb.TagNumber(5)
+  $fixnum.Int64 get registrationId => $_getI64(4);
+  @$pb.TagNumber(5)
+  set registrationId($fixnum.Int64 value) => $_setInt64(4, value);
+  @$pb.TagNumber(5)
+  $core.bool hasRegistrationId() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearRegistrationId() => $_clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.List<$core.int> get signedPrekeySignature => $_getN(5);
+  @$pb.TagNumber(6)
+  set signedPrekeySignature($core.List<$core.int> value) =>
+      $_setBytes(5, value);
+  @$pb.TagNumber(6)
+  $core.bool hasSignedPrekeySignature() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearSignedPrekeySignature() => $_clearField(6);
+
+  @$pb.TagNumber(7)
+  $fixnum.Int64 get signedPrekeyId => $_getI64(6);
+  @$pb.TagNumber(7)
+  set signedPrekeyId($fixnum.Int64 value) => $_setInt64(6, value);
+  @$pb.TagNumber(7)
+  $core.bool hasSignedPrekeyId() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearSignedPrekeyId() => $_clearField(7);
+}
+
+const $core.bool _omitFieldNames =
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/src/model/protobuf/client/generated/qr.pbenum.dart

@@ -0,0 +1,34 @@
+// This is a generated file - do not edit.
+//
+// Generated from qr.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names
+
+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 $core.List<QREnvelope_Type> values = <QREnvelope_Type>[
+    PublicProfile,
+  ];
+
+  static final $core.List<QREnvelope_Type?> _byValue =
+      $pb.ProtobufEnum.$_initByValueList(values, 0);
+  static QREnvelope_Type? valueOf($core.int value) =>
+      value < 0 || value >= _byValue.length ? null : _byValue[value];
+
+  const QREnvelope_Type._(super.value, super.name);
+}
+
+const $core.bool _omitEnumNames =
+    $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/src/model/protobuf/client/generated/qr.pbjson.dart

@@ -0,0 +1,80 @@
+// This is a generated file - do not edit.
+//
+// Generated from qr.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, unused_import
+
+import 'dart:convert' as $convert;
+import 'dart:core' as $core;
+import 'dart:typed_data' as $typed_data;
+
+@$core.Deprecated('Use qREnvelopeDescriptor instead')
+const QREnvelope$json = {
+  '1': 'QREnvelope',
+  '2': [
+    {
+      '1': 'type',
+      '3': 2,
+      '4': 1,
+      '5': 14,
+      '6': '.QREnvelope.Type',
+      '10': 'type'
+    },
+    {'1': 'data', '3': 3, '4': 1, '5': 12, '10': 'data'},
+  ],
+  '4': [QREnvelope_Type$json],
+};
+
+@$core.Deprecated('Use qREnvelopeDescriptor instead')
+const QREnvelope_Type$json = {
+  '1': 'Type',
+  '2': [
+    {'1': 'PublicProfile', '2': 0},
+  ],
+};
+
+/// Descriptor for `QREnvelope`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List qREnvelopeDescriptor = $convert.base64Decode(
+    'CgpRUkVudmVsb3BlEiQKBHR5cGUYAiABKA4yEC5RUkVudmVsb3BlLlR5cGVSBHR5cGUSEgoEZG'
+    'F0YRgDIAEoDFIEZGF0YSIZCgRUeXBlEhEKDVB1YmxpY1Byb2ZpbGUQAA==');
+
+@$core.Deprecated('Use publicProfileDescriptor instead')
+const PublicProfile$json = {
+  '1': 'PublicProfile',
+  '2': [
+    {'1': 'user_id', '3': 1, '4': 1, '5': 3, '10': 'userId'},
+    {'1': 'username', '3': 2, '4': 1, '5': 9, '10': 'username'},
+    {
+      '1': 'public_identity_key',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '10': 'publicIdentityKey'
+    },
+    {'1': 'signed_prekey', '3': 4, '4': 1, '5': 12, '10': 'signedPrekey'},
+    {'1': 'registration_id', '3': 5, '4': 1, '5': 3, '10': 'registrationId'},
+    {
+      '1': 'signed_prekey_signature',
+      '3': 6,
+      '4': 1,
+      '5': 12,
+      '10': 'signedPrekeySignature'
+    },
+    {'1': 'signed_prekey_id', '3': 7, '4': 1, '5': 3, '10': 'signedPrekeyId'},
+  ],
+};
+
+/// Descriptor for `PublicProfile`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List publicProfileDescriptor = $convert.base64Decode(
+    'Cg1QdWJsaWNQcm9maWxlEhcKB3VzZXJfaWQYASABKANSBnVzZXJJZBIaCgh1c2VybmFtZRgCIA'
+    'EoCVIIdXNlcm5hbWUSLgoTcHVibGljX2lkZW50aXR5X2tleRgDIAEoDFIRcHVibGljSWRlbnRp'
+    'dHlLZXkSIwoNc2lnbmVkX3ByZWtleRgEIAEoDFIMc2lnbmVkUHJla2V5EicKD3JlZ2lzdHJhdG'
+    'lvbl9pZBgFIAEoA1IOcmVnaXN0cmF0aW9uSWQSNgoXc2lnbmVkX3ByZWtleV9zaWduYXR1cmUY'
+    'BiABKAxSFXNpZ25lZFByZWtleVNpZ25hdHVyZRIoChBzaWduZWRfcHJla2V5X2lkGAcgASgDUg'
+    '5zaWduZWRQcmVrZXlJZA==');

lib/src/model/protobuf/client/qr.proto

@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+message QREnvelope {
+    enum Type {
+        PublicProfile = 0;
+    }
+    Type type = 2;
+    bytes data = 3;
+}
+
+message PublicProfile {
+    int64 user_id = 1;
+    string username = 2;
+    bytes public_identity_key = 3;
+    bytes signed_prekey = 4;
+    int64 registration_id = 5;
+    bytes signed_prekey_signature = 6;
+    int64 signed_prekey_id = 7;
+}

lib/src/utils/avatars.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:io';
 import 'dart:ui' as ui;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/src/utils/misc.dart';
@@ -15,7 +17,7 @@ Future<void> createPushAvatars() async {
 
     final pictureInfo = await vg.loadPicture(SvgStringLoader(avatarSvg), null);
 
-    final image = await pictureInfo.picture.toImage(300, 300);
+    final image = await pictureInfo.picture.toImage(270, 300);
 
     final byteData = await image.toByteData(format: ui.ImageByteFormat.png);
     final pngBytes = byteData!.buffer.asUint8List();
@@ -34,3 +36,23 @@ File avatarPNGFile(int contactId) {
   }
   return File('${avatarsDirectory.path}/$contactId.png');
 }
+
+Future<Uint8List> getUserAvatar() async {
+  if (gUser.avatarSvg == null) {
+    final data = await rootBundle.load('assets/images/default_avatar.png');
+    return data.buffer.asUint8List();
+  }
+
+  final pictureInfo =
+      await vg.loadPicture(SvgStringLoader(gUser.avatarSvg!), null);
+
+  final image = await pictureInfo.picture.toImage(270, 300);
+
+  final byteData = await image.toByteData(format: ui.ImageByteFormat.png);
+  final pngBytes = byteData!.buffer.asUint8List();
+
+  final file = avatarPNGFile(gUser.userId)..writeAsBytesSync(pngBytes);
+  pictureInfo.picture.dispose();
+
+  return file.readAsBytesSync();
+}

lib/src/utils/qr.dart

@@ -0,0 +1,47 @@
+import 'package:fixnum/fixnum.dart';
+import 'package:flutter/foundation.dart';
+import 'package:twonly/globals.dart';
+import 'package:twonly/src/model/protobuf/client/generated/qr.pb.dart';
+import 'package:twonly/src/services/signal/identity.signal.dart';
+import 'package:twonly/src/services/signal/utils.signal.dart';
+import 'package:twonly/src/utils/log.dart';
+
+Future<Uint8List> getProfileQrCodeData() async {
+  final signalIdentity = (await getSignalIdentity())!;
+
+  final signalStore = await getSignalStoreFromIdentity(signalIdentity);
+
+  final signedPreKey = (await signalStore.loadSignedPreKeys())[0];
+
+  final publicProfile = PublicProfile(
+    userId: Int64(gUser.userId),
+    username: gUser.username,
+    publicIdentityKey:
+        (await signalStore.getIdentityKeyPair()).getPublicKey().serialize(),
+    registrationId: Int64(signalIdentity.registrationId),
+    signedPrekey: signedPreKey.getKeyPair().publicKey.serialize(),
+    signedPrekeySignature: signedPreKey.signature,
+    signedPrekeyId: Int64(signedPreKey.id),
+  );
+
+  final data = publicProfile.writeToBuffer();
+
+  final qrEnvelope = QREnvelope(
+    type: QREnvelope_Type.PublicProfile,
+    data: data,
+  );
+
+  return qrEnvelope.writeToBuffer();
+}
+
+PublicProfile? parseQrCodeData(Uint8List rawBytes) {
+  try {
+    final envelop = QREnvelope.fromBuffer(rawBytes);
+    if (envelop.type == QREnvelope_Type.PublicProfile) {
+      return PublicProfile.fromBuffer(envelop.data);
+    }
+  } catch (e) {
+    Log.warn(e);
+  }
+  return null;
+}

lib/src/views/camera/painters/barcode_detector_painter.dart

@@ -5,6 +5,7 @@ import 'dart:ui' as ui;
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
 import 'package:google_mlkit_barcode_scanning/google_mlkit_barcode_scanning.dart';
+import 'package:twonly/src/utils/qr.dart';
 
 import 'coordinates_translator.dart';
 
@@ -31,6 +32,13 @@ class BarcodeDetectorPainter extends CustomPainter {
     final background = Paint()..color = const Color(0x99000000);
 
     for (final barcode in barcodes) {
+      final bytes = barcode.rawBytes;
+      if (bytes == null) continue;
+
+      final profile = parseQrCodeData(bytes);
+
+      if (profile == null) continue;
+
       final builder = ParagraphBuilder(
         ParagraphStyle(
           textAlign: TextAlign.left,
@@ -41,7 +49,7 @@ class BarcodeDetectorPainter extends CustomPainter {
         ..pushStyle(
           ui.TextStyle(color: Colors.lightGreenAccent, background: background),
         )
-        ..addText('${barcode.displayValue}')
+        ..addText(profile.username)
         ..pop();
 
       final left = translateX(

lib/src/views/chats/chat_list.view.dart

@@ -19,6 +19,7 @@ import 'package:twonly/src/views/chats/chat_list_components/group_list_item.dart
 import 'package:twonly/src/views/chats/start_new_chat.view.dart';
 import 'package:twonly/src/views/components/avatar_icon.component.dart';
 import 'package:twonly/src/views/components/notification_badge.dart';
+import 'package:twonly/src/views/public_profile.view.dart';
 import 'package:twonly/src/views/settings/help/changelog.view.dart';
 import 'package:twonly/src/views/settings/profile/profile.view.dart';
 import 'package:twonly/src/views/settings/settings_main.view.dart';
@@ -290,18 +291,45 @@ class _ChatListViewState extends State<ChatListView> {
       ),
       floatingActionButton: Padding(
         padding: const EdgeInsets.only(bottom: 30),
-        child: FloatingActionButton(
+        child: Column(
-          onPressed: () {
+          mainAxisAlignment: MainAxisAlignment.end,
-            Navigator.push(
+          children: [
-              context,
+            FloatingActionButton.small(
-              MaterialPageRoute(
+              backgroundColor: context.color.primary,
-                builder: (context) {
+              onPressed: () {
-                  return const StartNewChatView();
+                Navigator.push(
-                },
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) {
+                      return const PublicProfileView();
+                    },
+                  ),
+                );
+              },
+              child: const FaIcon(
+                FontAwesomeIcons.qrcode,
+                color: Colors.black,
               ),
-            );
+            ),
-          },
+            const SizedBox(height: 12),
-          child: const FaIcon(FontAwesomeIcons.penToSquare),
+            FloatingActionButton(
+              backgroundColor: context.color.primary,
+              onPressed: () {
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) {
+                      return const StartNewChatView();
+                    },
+                  ),
+                );
+              },
+              child: const FaIcon(
+                FontAwesomeIcons.penToSquare,
+                color: Colors.black,
+              ),
+            ),
+          ],
         ),
       ),
     );

lib/src/views/public_profile.view.dart

@@ -0,0 +1,102 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+import 'package:twonly/globals.dart';
+import 'package:twonly/src/utils/avatars.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/utils/qr.dart';
+
+class PublicProfileView extends StatefulWidget {
+  const PublicProfileView({super.key});
+
+  @override
+  State<PublicProfileView> createState() => _PublicProfileViewState();
+}
+
+class _PublicProfileViewState extends State<PublicProfileView> {
+  Uint8List? _qrCode;
+  Uint8List? _userAvatar;
+
+  @override
+  void initState() {
+    initAsync();
+    super.initState();
+  }
+
+  Future<void> initAsync() async {
+    _qrCode = await getProfileQrCodeData();
+    _userAvatar = await getUserAvatar();
+
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(),
+      body: Column(
+        children: [
+          Container(width: double.infinity),
+          const SizedBox(
+            height: 30,
+          ),
+          if (_qrCode != null && _userAvatar != null)
+            Container(
+              child: Container(
+                decoration: BoxDecoration(
+                  color: context.color.primary,
+                  borderRadius: BorderRadius.circular(12),
+                  border: Border.all(
+                    color: Colors.black,
+                    width: 2,
+                  ),
+                  boxShadow: const [
+                    BoxShadow(
+                      color: Colors.black26,
+                      blurRadius: 6,
+                      offset: Offset(0, 2),
+                    ),
+                  ],
+                ),
+                child: QrImageView.withQr(
+                  qr: QrCode.fromUint8List(
+                    data: _qrCode!,
+                    errorCorrectLevel: QrErrorCorrectLevel.M,
+                  ),
+                  eyeStyle: const QrEyeStyle(
+                    color: Colors.black,
+                    borderRadius: 2,
+                  ),
+                  dataModuleStyle: const QrDataModuleStyle(
+                    color: Colors.black,
+                    borderRadius: 2,
+                  ),
+                  gapless: false,
+                  embeddedImage: MemoryImage(_userAvatar!),
+                  embeddedImageStyle: QrEmbeddedImageStyle(
+                    size: const Size(60, 66),
+                    embeddedImageShape: EmbeddedImageShape.square,
+                    shapeColor: context.color.primary,
+                    safeArea: true,
+                  ),
+                  size: 250,
+                ),
+              ),
+            ),
+          Text(
+            gUser.displayName,
+            style: const TextStyle(fontSize: 24),
+          ),
+          Text(
+            gUser.username,
+            style: const TextStyle(fontSize: 18),
+          )
+          // QR Code,,,
+          // Display Name
+          // username...
+        ],
+      ),
+    );
+  }
+}

pubspec.lock

@@ -1423,12 +1423,19 @@ packages:
     source: hosted
     version: "1.5.0"
   qr:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
       path: "dependencies/qr"
       relative: true
     source: path
     version: "3.1.0-wip"
+  qr_flutter:
+    dependency: "direct main"
+    description:
+      path: "dependencies/qr_flutter"
+      relative: true
+    source: path
+    version: "4.1.0"
   recase:
     dependency: transitive
     description:

pubspec.yaml

@@ -97,7 +97,7 @@ dependencies:
   lottie: ^3.3.1
   mutex: ^3.1.0
   introduction_screen: ^4.0.0
-  qr: ^3.0.2
+  qr_flutter: ^4.1.0
 
 dependency_overrides:
   dots_indicator:
@@ -128,6 +128,8 @@ dependency_overrides:
     path: ./dependencies/pointycastle
   x25519:
     path: ./dependencies/x25519
+  qr_flutter:
+    path: ./dependencies/qr_flutter
   camera_android_camerax: 
     # path: ../flutter-packages/packages/camera/camera_android_camerax
     git:

scripts/generate_proto.sh

@@ -14,6 +14,7 @@ CLIENT_DIR="./lib/src/model/protobuf/client/"
 protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "backup.proto"
 protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "messages.proto"
 protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "groups.proto"
+protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "qr.proto"
 
 protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "push_notification.proto"
 protoc --proto_path="$CLIENT_DIR" --swift_out="./ios/NotificationService/" "push_notification.proto"