fix some protobuf issues

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

@@ -33,34 +33,26 @@ class TextMessage extends $pb.GeneratedMessage {
     return $result;
   }
   TextMessage._() : super();
-  factory TextMessage.fromBuffer($core.List<$core.int> i,
+  factory TextMessage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory TextMessage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      create()..mergeFromBuffer(i, r);
-  factory TextMessage.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TextMessage', package: const $pb.PackageName(_omitMessageNames ? '' : 'http_requests'), createEmptyInstance: create)
-      _omitMessageNames ? '' : 'TextMessage',
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'http_requests'),
-      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'userId')
-    ..a<$core.List<$core.int>>(
+    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'body', $pb.PbFieldType.OY)
-        2, _omitFieldNames ? '' : 'body', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(3, _omitFieldNames ? '' : 'pushData', $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
+    ..hasRequiredFields = false
-        3, _omitFieldNames ? '' : 'pushData', $pb.PbFieldType.OY)
+  ;
-    ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
   TextMessage clone() => TextMessage()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  TextMessage copyWith(void Function(TextMessage) updates) =>
+  TextMessage copyWith(void Function(TextMessage) updates) => super.copyWith((message) => updates(message as TextMessage)) as TextMessage;
-      super.copyWith((message) => updates(message as TextMessage))
-          as TextMessage;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -69,17 +61,13 @@ class TextMessage extends $pb.GeneratedMessage {
   TextMessage createEmptyInstance() => create();
   static $pb.PbList<TextMessage> createRepeated() => $pb.PbList<TextMessage>();
   @$core.pragma('dart2js:noInline')
-  static TextMessage getDefault() => _defaultInstance ??=
+  static TextMessage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<TextMessage>(create);
-      $pb.GeneratedMessage.$_defaultFor<TextMessage>(create);
   static TextMessage? _defaultInstance;
 
   @$pb.TagNumber(1)
   $fixnum.Int64 get userId => $_getI64(0);
   @$pb.TagNumber(1)
-  set userId($fixnum.Int64 v) {
+  set userId($fixnum.Int64 v) { $_setInt64(0, v); }
-    $_setInt64(0, v);
-  }
-
   @$pb.TagNumber(1)
   $core.bool hasUserId() => $_has(0);
   @$pb.TagNumber(1)
@@ -88,10 +76,7 @@ class TextMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.List<$core.int> get body => $_getN(1);
   @$pb.TagNumber(2)
-  set body($core.List<$core.int> v) {
+  set body($core.List<$core.int> v) { $_setBytes(1, v); }
-    $_setBytes(1, v);
-  }
-
   @$pb.TagNumber(2)
   $core.bool hasBody() => $_has(1);
   @$pb.TagNumber(2)
@@ -100,10 +85,7 @@ class TextMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.List<$core.int> get pushData => $_getN(2);
   @$pb.TagNumber(3)
-  set pushData($core.List<$core.int> v) {
+  set pushData($core.List<$core.int> v) { $_setBytes(2, v); }
-    $_setBytes(2, v);
-  }
-
   @$pb.TagNumber(3)
   $core.bool hasPushData() => $_has(2);
   @$pb.TagNumber(3)
@@ -129,56 +111,41 @@ class UploadRequest extends $pb.GeneratedMessage {
     return $result;
   }
   UploadRequest._() : super();
-  factory UploadRequest.fromBuffer($core.List<$core.int> i,
+  factory UploadRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory UploadRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      create()..mergeFromBuffer(i, r);
-  factory UploadRequest.fromJson($core.String i,
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-      create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UploadRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'http_requests'), createEmptyInstance: create)
-      _omitMessageNames ? '' : 'UploadRequest',
+    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'encryptedData', $pb.PbFieldType.OY)
-      package: const $pb.PackageName(_omitMessageNames ? '' : 'http_requests'),
+    ..p<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'downloadTokens', $pb.PbFieldType.PY)
-      createEmptyInstance: create)
+    ..pc<TextMessage>(3, _omitFieldNames ? '' : 'messagesOnSuccess', $pb.PbFieldType.PM, subBuilder: TextMessage.create)
-    ..a<$core.List<$core.int>>(
+    ..hasRequiredFields = false
-        1, _omitFieldNames ? '' : 'encryptedData', $pb.PbFieldType.OY)
+  ;
-    ..p<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'downloadTokens', $pb.PbFieldType.PY)
-    ..pc<TextMessage>(
-        3, _omitFieldNames ? '' : 'messagesOnSuccess', $pb.PbFieldType.PM,
-        subBuilder: TextMessage.create)
-    ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
   UploadRequest clone() => UploadRequest()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  UploadRequest copyWith(void Function(UploadRequest) updates) =>
+  UploadRequest copyWith(void Function(UploadRequest) updates) => super.copyWith((message) => updates(message as UploadRequest)) as UploadRequest;
-      super.copyWith((message) => updates(message as UploadRequest))
-          as UploadRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static UploadRequest create() => UploadRequest._();
   UploadRequest createEmptyInstance() => create();
-  static $pb.PbList<UploadRequest> createRepeated() =>
+  static $pb.PbList<UploadRequest> createRepeated() => $pb.PbList<UploadRequest>();
-      $pb.PbList<UploadRequest>();
   @$core.pragma('dart2js:noInline')
-  static UploadRequest getDefault() => _defaultInstance ??=
+  static UploadRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UploadRequest>(create);
-      $pb.GeneratedMessage.$_defaultFor<UploadRequest>(create);
   static UploadRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.List<$core.int> get encryptedData => $_getN(0);
   @$pb.TagNumber(1)
-  set encryptedData($core.List<$core.int> v) {
+  set encryptedData($core.List<$core.int> v) { $_setBytes(0, v); }
-    $_setBytes(0, v);
-  }
-
   @$pb.TagNumber(1)
   $core.bool hasEncryptedData() => $_has(0);
   @$pb.TagNumber(1)
@@ -191,6 +158,6 @@ class UploadRequest extends $pb.GeneratedMessage {
   $core.List<TextMessage> get messagesOnSuccess => $_getList(2);
 }
 
+
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames =
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
-    $core.bool.fromEnvironment('protobuf.omit_message_names');

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

@@ -8,3 +8,4 @@
 // ignore_for_file: constant_identifier_names, library_prefixes
 // ignore_for_file: non_constant_identifier_names, prefer_final_fields
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+

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

@@ -19,15 +19,7 @@ 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'},
@@ -45,14 +37,7 @@ 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'
-    },
   ],
 };
 
@@ -62,3 +47,4 @@ final $typed_data.Uint8List uploadRequestDescriptor = $convert.base64Decode(
     'cKD2Rvd25sb2FkX3Rva2VucxgCIAMoDFIOZG93bmxvYWRUb2tlbnMSSgoTbWVzc2FnZXNfb25f'
     'c3VjY2VzcxgDIAMoCzIaLmh0dHBfcmVxdWVzdHMuVGV4dE1lc3NhZ2VSEW1lc3NhZ2VzT25TdW'
     'NjZXNz');
+

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

@@ -11,3 +11,4 @@
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'http_requests.pb.dart';
+

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

@@ -8,3 +8,4 @@
 // ignore_for_file: constant_identifier_names, library_prefixes
 // ignore_for_file: non_constant_identifier_names, prefer_final_fields
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+

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

@@ -17,15 +17,7 @@ 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'},
@@ -42,33 +34,9 @@ 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': 'handshake',
+    {'1': 'applicationdata', '3': 3, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData', '9': 0, '10': 'applicationdata'},
-      '3': 2,
+    {'1': 'response', '3': 4, '4': 1, '5': 11, '6': '.client_to_server.Response', '9': 0, '10': 'response'},
-      '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'},
@@ -87,49 +55,12 @@ 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': 'register',
+    {'1': 'getauthchallenge', '3': 2, '4': 1, '5': 11, '6': '.client_to_server.Handshake.GetAuthChallenge', '9': 0, '10': 'getauthchallenge'},
-      '3': 1,
+    {'1': 'getauthtoken', '3': 3, '4': 1, '5': 11, '6': '.client_to_server.Handshake.GetAuthToken', '9': 0, '10': 'getauthtoken'},
-      '4': 1,
+    {'1': 'authenticate', '3': 4, '4': 1, '5': 11, '6': '.client_to_server.Handshake.Authenticate', '9': 0, '10': 'authenticate'},
-      '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'
-    },
-  ],
-  '3': [
-    Handshake_Register$json,
-    Handshake_GetAuthChallenge$json,
-    Handshake_GetAuthToken$json,
-    Handshake_Authenticate$json
   ],
+  '3': [Handshake_Register$json, Handshake_GetAuthChallenge$json, Handshake_GetAuthToken$json, Handshake_Authenticate$json],
   '8': [
     {'1': 'Handshake'},
   ],
@@ -140,30 +71,10 @@ 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': 'invite_code',
+    {'1': 'public_identity_key', '3': 3, '4': 1, '5': 12, '10': 'publicIdentityKey'},
-      '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, '9': 1, '10': 'isIos', '17': true},
@@ -194,15 +105,7 @@ 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': 'app_version',
-      '3': 3,
-      '4': 1,
-      '5': 9,
-      '9': 0,
-      '10': 'appVersion',
-      '17': true
-    },
   ],
   '8': [
     {'1': '_app_version'},
@@ -233,209 +136,28 @@ 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': 'textmessage',
+    {'1': 'getuserbyusername', '3': 2, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetUserByUsername', '9': 0, '10': 'getuserbyusername'},
-      '3': 1,
+    {'1': 'getprekeysbyuserid', '3': 3, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetPrekeysByUserId', '9': 0, '10': 'getprekeysbyuserid'},
-      '4': 1,
+    {'1': 'getuserbyid', '3': 6, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetUserById', '9': 0, '10': 'getuserbyid'},
-      '5': 11,
+    {'1': 'updategooglefcmtoken', '3': 8, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.UpdateGoogleFcmToken', '9': 0, '10': 'updategooglefcmtoken'},
-      '6': '.client_to_server.ApplicationData.TextMessage',
+    {'1': 'getlocation', '3': 9, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetLocation', '9': 0, '10': 'getlocation'},
-      '9': 0,
+    {'1': 'getcurrentplaninfos', '3': 10, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetCurrentPlanInfos', '9': 0, '10': 'getcurrentplaninfos'},
-      '10': 'textmessage'
+    {'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': 'getuserbyusername',
+    {'1': 'getvouchers', '3': 14, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetVouchers', '9': 0, '10': 'getvouchers'},
-      '3': 2,
+    {'1': 'Switchtopayedplan', '3': 15, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.SwitchToPayedPlan', '9': 0, '10': 'Switchtopayedplan'},
-      '4': 1,
+    {'1': 'getaddaccountsinvites', '3': 16, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.GetAddAccountsInvites', '9': 0, '10': 'getaddaccountsinvites'},
-      '5': 11,
+    {'1': 'redeemadditionalcode', '3': 17, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.RedeemAdditionalCode', '9': 0, '10': 'redeemadditionalcode'},
-      '6': '.client_to_server.ApplicationData.GetUserByUsername',
+    {'1': 'removeadditionaluser', '3': 18, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.RemoveAdditionalUser', '9': 0, '10': 'removeadditionaluser'},
-      '9': 0,
+    {'1': 'updateplanoptions', '3': 19, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.UpdatePlanOptions', '9': 0, '10': 'updateplanoptions'},
-      '10': 'getuserbyusername'
+    {'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': 'getprekeysbyuserid',
+    {'1': 'deleteaccount', '3': 24, '4': 1, '5': 11, '6': '.client_to_server.ApplicationData.DeleteAccount', '9': 0, '10': 'deleteaccount'},
-      '3': 3,
-      '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'
-    },
-  ],
-  '3': [
-    ApplicationData_TextMessage$json,
-    ApplicationData_GetUserByUsername$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_DeleteAccount$json
   ],
+  '3': [ApplicationData_TextMessage$json, ApplicationData_GetUserByUsername$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_DeleteAccount$json],
   '8': [
     {'1': 'ApplicationData'},
   ],
@@ -447,15 +169,7 @@ 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'},
@@ -583,13 +297,7 @@ 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'
-    },
   ],
 };
 
@@ -668,24 +376,8 @@ 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': 'ok',
+    {'1': 'error', '3': 2, '4': 1, '5': 14, '6': '.error.ErrorCode', '9': 0, '10': 'error'},
-      '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': [
@@ -706,14 +398,7 @@ 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'
-    },
   ],
 };
 
@@ -722,15 +407,7 @@ 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'},
@@ -745,3 +422,4 @@ final $typed_data.Uint8List responseDescriptor = $convert.base64Decode(
     'ByZWtleXMYASADKAsyIS5jbGllbnRfdG9fc2VydmVyLlJlc3BvbnNlLlByZUtleVIHcHJla2V5'
     'cxpgCgJPaxIUCgROb25lGAEgASgISABSBE5vbmUSPgoHcHJla2V5cxgCIAEoCzIiLmNsaWVudF'
     '90b19zZXJ2ZXIuUmVzcG9uc2UuUHJla2V5c0gAUgdwcmVrZXlzQgQKAk9rQgoKCFJlc3BvbnNl');
+

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

@@ -11,3 +11,4 @@
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'client_to_server.pb.dart';
+

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

@@ -12,3 +12,4 @@
 import 'dart:core' as $core;
 
 export 'error.pbenum.dart';
+

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

@@ -14,72 +14,39 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class ErrorCode extends $pb.ProtobufEnum {
-  static const ErrorCode Unknown =
+  static const ErrorCode Unknown = ErrorCode._(0, _omitEnumNames ? '' : 'Unknown');
-      ErrorCode._(0, _omitEnumNames ? '' : 'Unknown');
+  static const ErrorCode BadRequest = ErrorCode._(400, _omitEnumNames ? '' : 'BadRequest');
-  static const ErrorCode BadRequest =
+  static const ErrorCode TooManyRequests = ErrorCode._(429, _omitEnumNames ? '' : 'TooManyRequests');
-      ErrorCode._(400, _omitEnumNames ? '' : 'BadRequest');
+  static const ErrorCode InternalError = ErrorCode._(500, _omitEnumNames ? '' : 'InternalError');
-  static const ErrorCode TooManyRequests =
+  static const ErrorCode InvalidInvitationCode = ErrorCode._(1002, _omitEnumNames ? '' : 'InvalidInvitationCode');
-      ErrorCode._(429, _omitEnumNames ? '' : 'TooManyRequests');
+  static const ErrorCode UsernameAlreadyTaken = ErrorCode._(1003, _omitEnumNames ? '' : 'UsernameAlreadyTaken');
-  static const ErrorCode InternalError =
+  static const ErrorCode SignatureNotValid = ErrorCode._(1004, _omitEnumNames ? '' : 'SignatureNotValid');
-      ErrorCode._(500, _omitEnumNames ? '' : 'InternalError');
+  static const ErrorCode UsernameNotFound = ErrorCode._(1005, _omitEnumNames ? '' : 'UsernameNotFound');
-  static const ErrorCode InvalidInvitationCode =
+  static const ErrorCode UsernameNotValid = ErrorCode._(1006, _omitEnumNames ? '' : 'UsernameNotValid');
-      ErrorCode._(1002, _omitEnumNames ? '' : 'InvalidInvitationCode');
+  static const ErrorCode InvalidPublicKey = ErrorCode._(1007, _omitEnumNames ? '' : 'InvalidPublicKey');
-  static const ErrorCode UsernameAlreadyTaken =
+  static const ErrorCode SessionAlreadyAuthenticated = ErrorCode._(1008, _omitEnumNames ? '' : 'SessionAlreadyAuthenticated');
-      ErrorCode._(1003, _omitEnumNames ? '' : 'UsernameAlreadyTaken');
+  static const ErrorCode SessionNotAuthenticated = ErrorCode._(1009, _omitEnumNames ? '' : 'SessionNotAuthenticated');
-  static const ErrorCode SignatureNotValid =
+  static const ErrorCode OnlyOneSessionAllowed = ErrorCode._(1010, _omitEnumNames ? '' : 'OnlyOneSessionAllowed');
-      ErrorCode._(1004, _omitEnumNames ? '' : 'SignatureNotValid');
+  static const ErrorCode UploadLimitReached = ErrorCode._(1011, _omitEnumNames ? '' : 'UploadLimitReached');
-  static const ErrorCode UsernameNotFound =
+  static const ErrorCode InvalidUpdateToken = ErrorCode._(1012, _omitEnumNames ? '' : 'InvalidUpdateToken');
-      ErrorCode._(1005, _omitEnumNames ? '' : 'UsernameNotFound');
+  static const ErrorCode InvalidOffset = ErrorCode._(1013, _omitEnumNames ? '' : 'InvalidOffset');
-  static const ErrorCode UsernameNotValid =
+  static const ErrorCode InvalidGoogleFcmToken = ErrorCode._(1014, _omitEnumNames ? '' : 'InvalidGoogleFcmToken');
-      ErrorCode._(1006, _omitEnumNames ? '' : 'UsernameNotValid');
+  static const ErrorCode UploadTokenIsBlocked = ErrorCode._(1015, _omitEnumNames ? '' : 'UploadTokenIsBlocked');
-  static const ErrorCode InvalidPublicKey =
+  static const ErrorCode UploadChecksumInvalid = ErrorCode._(1016, _omitEnumNames ? '' : 'UploadChecksumInvalid');
-      ErrorCode._(1007, _omitEnumNames ? '' : 'InvalidPublicKey');
+  static const ErrorCode InvalidDownloadToken = ErrorCode._(1017, _omitEnumNames ? '' : 'InvalidDownloadToken');
-  static const ErrorCode SessionAlreadyAuthenticated =
+  static const ErrorCode ApiEndpointNotFound = ErrorCode._(1018, _omitEnumNames ? '' : 'ApiEndpointNotFound');
-      ErrorCode._(1008, _omitEnumNames ? '' : 'SessionAlreadyAuthenticated');
+  static const ErrorCode AuthTokenNotValid = ErrorCode._(1019, _omitEnumNames ? '' : 'AuthTokenNotValid');
-  static const ErrorCode SessionNotAuthenticated =
+  static const ErrorCode InvalidPreKeys = ErrorCode._(1020, _omitEnumNames ? '' : 'InvalidPreKeys');
-      ErrorCode._(1009, _omitEnumNames ? '' : 'SessionNotAuthenticated');
+  static const ErrorCode VoucherInValid = ErrorCode._(1021, _omitEnumNames ? '' : 'VoucherInValid');
-  static const ErrorCode OnlyOneSessionAllowed =
+  static const ErrorCode PlanNotAllowed = ErrorCode._(1022, _omitEnumNames ? '' : 'PlanNotAllowed');
-      ErrorCode._(1010, _omitEnumNames ? '' : 'OnlyOneSessionAllowed');
+  static const ErrorCode PlanLimitReached = ErrorCode._(1023, _omitEnumNames ? '' : 'PlanLimitReached');
-  static const ErrorCode UploadLimitReached =
+  static const ErrorCode NotEnoughCredit = ErrorCode._(1024, _omitEnumNames ? '' : 'NotEnoughCredit');
-      ErrorCode._(1011, _omitEnumNames ? '' : 'UploadLimitReached');
+  static const ErrorCode PlanDowngrade = ErrorCode._(1025, _omitEnumNames ? '' : 'PlanDowngrade');
-  static const ErrorCode InvalidUpdateToken =
+  static const ErrorCode PlanUpgradeNotYearly = ErrorCode._(1026, _omitEnumNames ? '' : 'PlanUpgradeNotYearly');
-      ErrorCode._(1012, _omitEnumNames ? '' : 'InvalidUpdateToken');
+  static const ErrorCode InvalidSignedPreKey = ErrorCode._(1027, _omitEnumNames ? '' : 'InvalidSignedPreKey');
-  static const ErrorCode InvalidOffset =
+  static const ErrorCode UserIdNotFound = ErrorCode._(1028, _omitEnumNames ? '' : 'UserIdNotFound');
-      ErrorCode._(1013, _omitEnumNames ? '' : 'InvalidOffset');
+  static const ErrorCode UserIdAlreadyTaken = ErrorCode._(1029, _omitEnumNames ? '' : 'UserIdAlreadyTaken');
-  static const ErrorCode InvalidGoogleFcmToken =
+  static const ErrorCode AppVersionOutdated = ErrorCode._(1030, _omitEnumNames ? '' : 'AppVersionOutdated');
-      ErrorCode._(1014, _omitEnumNames ? '' : 'InvalidGoogleFcmToken');
-  static const ErrorCode UploadTokenIsBlocked =
-      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 $core.List<ErrorCode> values = <ErrorCode> [
     Unknown,
@@ -117,11 +84,11 @@ class ErrorCode extends $pb.ProtobufEnum {
     AppVersionOutdated,
   ];
 
-  static final $core.Map<$core.int, ErrorCode> _byValue =
+  static final $core.Map<$core.int, ErrorCode> _byValue = $pb.ProtobufEnum.initByValue(values);
-      $pb.ProtobufEnum.initByValue(values);
   static ErrorCode? valueOf($core.int value) => _byValue[value];
 
   const ErrorCode._($core.int v, $core.String n) : super(v, n);
 }
 
+
 const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

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

@@ -70,3 +70,4 @@ final $typed_data.Uint8List errorCodeDescriptor = $convert.base64Decode(
     'bGFuRG93bmdyYWRlEIEIEhkKFFBsYW5VcGdyYWRlTm90WWVhcmx5EIIIEhgKE0ludmFsaWRTaW'
     'duZWRQcmVLZXkQgwgSEwoOVXNlcklkTm90Rm91bmQQhAgSFwoSVXNlcklkQWxyZWFkeVRha2Vu'
     'EIUIEhcKEkFwcFZlcnNpb25PdXRkYXRlZBCGCA==');
+

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

@@ -11,3 +11,4 @@
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'error.pb.dart';
+

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

@@ -14,25 +14,16 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class Response_TransactionTypes extends $pb.ProtobufEnum {
-  static const Response_TransactionTypes Refund =
+  static const Response_TransactionTypes Refund = Response_TransactionTypes._(0, _omitEnumNames ? '' : 'Refund');
-      Response_TransactionTypes._(0, _omitEnumNames ? '' : 'Refund');
+  static const Response_TransactionTypes VoucherRedeemed = Response_TransactionTypes._(1, _omitEnumNames ? '' : 'VoucherRedeemed');
-  static const Response_TransactionTypes VoucherRedeemed =
+  static const Response_TransactionTypes VoucherCreated = Response_TransactionTypes._(2, _omitEnumNames ? '' : 'VoucherCreated');
-      Response_TransactionTypes._(1, _omitEnumNames ? '' : 'VoucherRedeemed');
+  static const Response_TransactionTypes Cash = Response_TransactionTypes._(3, _omitEnumNames ? '' : 'Cash');
-  static const Response_TransactionTypes VoucherCreated =
+  static const Response_TransactionTypes PlanUpgrade = Response_TransactionTypes._(4, _omitEnumNames ? '' : 'PlanUpgrade');
-      Response_TransactionTypes._(2, _omitEnumNames ? '' : 'VoucherCreated');
+  static const Response_TransactionTypes Unknown = Response_TransactionTypes._(5, _omitEnumNames ? '' : 'Unknown');
-  static const Response_TransactionTypes Cash =
+  static const Response_TransactionTypes ThanksForTesting = Response_TransactionTypes._(6, _omitEnumNames ? '' : 'ThanksForTesting');
-      Response_TransactionTypes._(3, _omitEnumNames ? '' : 'Cash');
+  static const Response_TransactionTypes AutoRenewal = Response_TransactionTypes._(7, _omitEnumNames ? '' : 'AutoRenewal');
-  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 =
+  static const $core.List<Response_TransactionTypes> values = <Response_TransactionTypes> [
-      <Response_TransactionTypes>[
     Refund,
     VoucherRedeemed,
     VoucherCreated,
@@ -43,11 +34,11 @@ class Response_TransactionTypes extends $pb.ProtobufEnum {
     AutoRenewal,
   ];
 
-  static final $core.Map<$core.int, Response_TransactionTypes> _byValue =
+  static final $core.Map<$core.int, Response_TransactionTypes> _byValue = $pb.ProtobufEnum.initByValue(values);
-      $pb.ProtobufEnum.initByValue(values);
   static Response_TransactionTypes? valueOf($core.int value) => _byValue[value];
 
   const Response_TransactionTypes._($core.int v, $core.String n) : super(v, n);
 }
 
+
 const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

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

@@ -17,15 +17,7 @@ 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'},
@@ -42,41 +34,10 @@ 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': 'response',
+    {'1': 'newMessage', '3': 3, '4': 1, '5': 11, '6': '.server_to_client.NewMessage', '9': 0, '10': 'newMessage'},
-      '3': 2,
+    {'1': 'RequestNewPreKeys', '3': 4, '4': 1, '5': 8, '9': 0, '10': 'RequestNewPreKeys'},
-      '4': 1,
+    {'1': 'error', '3': 6, '4': 1, '5': 14, '6': '.error.ErrorCode', '9': 0, '10': 'error'},
-      '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'},
@@ -109,44 +70,10 @@ 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': 'ok',
+    {'1': 'error', '3': 2, '4': 1, '5': 14, '6': '.error.ErrorCode', '9': 0, '10': 'error'},
-      '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_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_Ok$json],
   '4': [Response_TransactionTypes$json],
   '8': [
     {'1': 'Response'},
@@ -167,56 +94,14 @@ 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': 'daily_media_upload_limit',
+    {'1': 'maximal_upload_size_of_single_media_size', '3': 4, '4': 1, '5': 3, '10': 'maximalUploadSizeOfSingleMediaSize'},
-      '3': 3,
+    {'1': 'additional_plus_accounts', '3': 5, '4': 1, '5': 3, '10': 'additionalPlusAccounts'},
-      '4': 1,
+    {'1': 'additional_free_accounts', '3': 6, '4': 1, '5': 3, '10': 'additionalFreeAccounts'},
-      '5': 3,
+    {'1': 'monthly_costs_cent', '3': 7, '4': 1, '5': 3, '10': 'monthlyCostsCent'},
-      '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': 'allowed_to_send_text_messages',
+    {'1': 'is_additional_account', '3': 10, '4': 1, '5': 8, '10': 'isAdditionalAccount'},
-      '3': 9,
-      '4': 1,
-      '5': 8,
-      '10': 'allowedToSendTextMessages'
-    },
-    {
-      '1': 'is_additional_account',
-      '3': 10,
-      '4': 1,
-      '5': 8,
-      '10': 'isAdditionalAccount'
-    },
   ],
 };
 
@@ -224,14 +109,7 @@ 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'
-    },
   ],
 };
 
@@ -248,14 +126,7 @@ 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'
-    },
   ],
 };
 
@@ -264,21 +135,8 @@ 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': 'transaction_type',
+    {'1': 'created_at_unix_timestamp', '3': 3, '4': 1, '5': 3, '10': 'createdAtUnixTimestamp'},
-      '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'
-    },
   ],
 };
 
@@ -299,13 +157,7 @@ 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'
-    },
   ],
 };
 
@@ -313,14 +165,7 @@ 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'
-    },
   ],
 };
 
@@ -328,72 +173,14 @@ 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_daily_media_upload_limit',
+    {'1': 'used_upload_media_size_limit', '3': 2, '4': 1, '5': 3, '10': 'usedUploadMediaSizeLimit'},
-      '3': 1,
+    {'1': 'payment_period_days', '3': 3, '4': 1, '5': 3, '9': 0, '10': 'paymentPeriodDays', '17': true},
-      '4': 1,
+    {'1': 'last_payment_done_unix_timestamp', '3': 4, '4': 1, '5': 3, '9': 1, '10': 'lastPaymentDoneUnixTimestamp', '17': true},
-      '5': 3,
+    {'1': 'transactions', '3': 5, '4': 3, '5': 11, '6': '.server_to_client.Response.Transaction', '10': 'transactions'},
-      '10': 'usedDailyMediaUploadLimit'
+    {'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},
-      '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'},
@@ -428,13 +215,7 @@ 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'
-    },
   ],
 };
 
@@ -443,59 +224,12 @@ 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': 'prekeys',
+    {'1': 'username', '3': 7, '4': 1, '5': 12, '9': 0, '10': 'username', '17': true},
-      '3': 2,
+    {'1': 'public_identity_key', '3': 3, '4': 1, '5': 12, '9': 1, '10': 'publicIdentityKey', '17': true},
-      '4': 3,
+    {'1': 'signed_prekey', '3': 4, '4': 1, '5': 12, '9': 2, '10': 'signedPrekey', '17': true},
-      '5': 11,
+    {'1': 'signed_prekey_signature', '3': 5, '4': 1, '5': 12, '9': 3, '10': 'signedPrekeySignature', '17': true},
-      '6': '.server_to_client.Response.PreKey',
+    {'1': 'signed_prekey_id', '3': 6, '4': 1, '5': 3, '9': 4, '10': 'signedPrekeyId', '17': true},
-      '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'},
@@ -529,105 +263,18 @@ 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': 'authchallenge',
+    {'1': 'uploadtoken', '3': 4, '4': 1, '5': 11, '6': '.server_to_client.Response.UploadToken', '9': 0, '10': 'uploadtoken'},
-      '3': 3,
+    {'1': 'userdata', '3': 5, '4': 1, '5': 11, '6': '.server_to_client.Response.UserData', '9': 0, '10': 'userdata'},
-      '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': 'location',
+    {'1': 'authenticated', '3': 8, '4': 1, '5': 11, '6': '.server_to_client.Response.Authenticated', '9': 0, '10': 'authenticated'},
-      '3': 7,
+    {'1': 'plans', '3': 9, '4': 1, '5': 11, '6': '.server_to_client.Response.Plans', '9': 0, '10': 'plans'},
-      '4': 1,
+    {'1': 'planballance', '3': 10, '4': 1, '5': 11, '6': '.server_to_client.Response.PlanBallance', '9': 0, '10': 'planballance'},
-      '5': 11,
+    {'1': 'vouchers', '3': 11, '4': 1, '5': 11, '6': '.server_to_client.Response.Vouchers', '9': 0, '10': 'vouchers'},
-      '6': '.server_to_client.Response.Location',
+    {'1': 'addaccountsinvites', '3': 12, '4': 1, '5': 11, '6': '.server_to_client.Response.AddAccountsInvites', '9': 0, '10': 'addaccountsinvites'},
-      '9': 0,
+    {'1': 'downloadtokens', '3': 13, '4': 1, '5': 11, '6': '.server_to_client.Response.DownloadTokens', '9': 0, '10': 'downloadtokens'},
-      '10': 'location'
+    {'1': 'signedprekey', '3': 14, '4': 1, '5': 11, '6': '.server_to_client.Response.SignedPreKey', '9': 0, '10': 'signedprekey'},
-    },
-    {
-      '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'
-    },
   ],
   '8': [
     {'1': 'Ok'},
@@ -725,3 +372,4 @@ final $typed_data.Uint8List responseDescriptor = $convert.base64Decode(
     'ESEgoOVm91Y2hlckNyZWF0ZWQQAhIICgRDYXNoEAMSDwoLUGxhblVwZ3JhZGUQBBILCgdVbmtu'
     'b3duEAUSFAoQVGhhbmtzRm9yVGVzdGluZxAGEg8KC0F1dG9SZW5ld2FsEAdCCgoIUmVzcG9uc2'
     'U=');
+

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

@@ -11,3 +11,4 @@
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'server_to_client.pb.dart';
+

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

@@ -28,55 +28,40 @@ class TwonlySafeBackupContent extends $pb.GeneratedMessage {
     return $result;
   }
   TwonlySafeBackupContent._() : super();
-  factory TwonlySafeBackupContent.fromBuffer($core.List<$core.int> i,
+  factory TwonlySafeBackupContent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory TwonlySafeBackupContent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      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(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TwonlySafeBackupContent', createEmptyInstance: create)
-      _omitMessageNames ? '' : 'TwonlySafeBackupContent',
+    ..aOS(1, _omitFieldNames ? '' : 'secureStorageJson', protoName: 'secureStorageJson')
-      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'twonlyDatabase', $pb.PbFieldType.OY, protoName: 'twonlyDatabase')
-    ..aOS(1, _omitFieldNames ? '' : 'secureStorageJson',
+    ..hasRequiredFields = false
-        protoName: 'secureStorageJson')
+  ;
-    ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'twonlyDatabase', $pb.PbFieldType.OY,
-        protoName: 'twonlyDatabase')
-    ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  TwonlySafeBackupContent clone() =>
+  TwonlySafeBackupContent clone() => TwonlySafeBackupContent()..mergeFromMessage(this);
-      TwonlySafeBackupContent()..mergeFromMessage(this);
+  @$core.Deprecated(
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  TwonlySafeBackupContent copyWith(
+  TwonlySafeBackupContent copyWith(void Function(TwonlySafeBackupContent) updates) => super.copyWith((message) => updates(message as TwonlySafeBackupContent)) as TwonlySafeBackupContent;
-          void Function(TwonlySafeBackupContent) updates) =>
-      super.copyWith((message) => updates(message as TwonlySafeBackupContent))
-          as TwonlySafeBackupContent;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static TwonlySafeBackupContent create() => TwonlySafeBackupContent._();
   TwonlySafeBackupContent createEmptyInstance() => create();
-  static $pb.PbList<TwonlySafeBackupContent> createRepeated() =>
+  static $pb.PbList<TwonlySafeBackupContent> createRepeated() => $pb.PbList<TwonlySafeBackupContent>();
-      $pb.PbList<TwonlySafeBackupContent>();
   @$core.pragma('dart2js:noInline')
-  static TwonlySafeBackupContent getDefault() => _defaultInstance ??=
+  static TwonlySafeBackupContent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupContent>(create);
-      $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) {
+  set secureStorageJson($core.String v) { $_setString(0, v); }
-    $_setString(0, v);
-  }
-
   @$pb.TagNumber(1)
   $core.bool hasSecureStorageJson() => $_has(0);
   @$pb.TagNumber(1)
@@ -85,10 +70,7 @@ class TwonlySafeBackupContent extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.List<$core.int> get twonlyDatabase => $_getN(1);
   @$pb.TagNumber(2)
-  set twonlyDatabase($core.List<$core.int> v) {
+  set twonlyDatabase($core.List<$core.int> v) { $_setBytes(1, v); }
-    $_setBytes(1, v);
-  }
-
   @$pb.TagNumber(2)
   $core.bool hasTwonlyDatabase() => $_has(1);
   @$pb.TagNumber(2)
@@ -114,57 +96,41 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
     return $result;
   }
   TwonlySafeBackupEncrypted._() : super();
-  factory TwonlySafeBackupEncrypted.fromBuffer($core.List<$core.int> i,
+  factory TwonlySafeBackupEncrypted.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory TwonlySafeBackupEncrypted.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      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(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TwonlySafeBackupEncrypted', createEmptyInstance: create)
-      _omitMessageNames ? '' : 'TwonlySafeBackupEncrypted',
+    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
-      createEmptyInstance: create)
+    ..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, protoName: 'cipherText')
-        1, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false
-    ..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('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  TwonlySafeBackupEncrypted clone() =>
+  TwonlySafeBackupEncrypted clone() => TwonlySafeBackupEncrypted()..mergeFromMessage(this);
-      TwonlySafeBackupEncrypted()..mergeFromMessage(this);
+  @$core.Deprecated(
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  TwonlySafeBackupEncrypted copyWith(
+  TwonlySafeBackupEncrypted copyWith(void Function(TwonlySafeBackupEncrypted) updates) => super.copyWith((message) => updates(message as TwonlySafeBackupEncrypted)) as TwonlySafeBackupEncrypted;
-          void Function(TwonlySafeBackupEncrypted) updates) =>
-      super.copyWith((message) => updates(message as TwonlySafeBackupEncrypted))
-          as TwonlySafeBackupEncrypted;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static TwonlySafeBackupEncrypted create() => TwonlySafeBackupEncrypted._();
   TwonlySafeBackupEncrypted createEmptyInstance() => create();
-  static $pb.PbList<TwonlySafeBackupEncrypted> createRepeated() =>
+  static $pb.PbList<TwonlySafeBackupEncrypted> createRepeated() => $pb.PbList<TwonlySafeBackupEncrypted>();
-      $pb.PbList<TwonlySafeBackupEncrypted>();
   @$core.pragma('dart2js:noInline')
-  static TwonlySafeBackupEncrypted getDefault() => _defaultInstance ??=
+  static TwonlySafeBackupEncrypted getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupEncrypted>(create);
-      $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) {
+  set mac($core.List<$core.int> v) { $_setBytes(0, v); }
-    $_setBytes(0, v);
-  }
-
   @$pb.TagNumber(1)
   $core.bool hasMac() => $_has(0);
   @$pb.TagNumber(1)
@@ -173,10 +139,7 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.List<$core.int> get nonce => $_getN(1);
   @$pb.TagNumber(2)
-  set nonce($core.List<$core.int> v) {
+  set nonce($core.List<$core.int> v) { $_setBytes(1, v); }
-    $_setBytes(1, v);
-  }
-
   @$pb.TagNumber(2)
   $core.bool hasNonce() => $_has(1);
   @$pb.TagNumber(2)
@@ -185,16 +148,13 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.List<$core.int> get cipherText => $_getN(2);
   @$pb.TagNumber(3)
-  set cipherText($core.List<$core.int> v) {
+  set cipherText($core.List<$core.int> v) { $_setBytes(2, v); }
-    $_setBytes(2, v);
-  }
-
   @$pb.TagNumber(3)
   $core.bool hasCipherText() => $_has(2);
   @$pb.TagNumber(3)
   void clearCipherText() => clearField(3);
 }
 
+
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames =
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
-    $core.bool.fromEnvironment('protobuf.omit_message_names');

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

@@ -8,3 +8,4 @@
 // ignore_for_file: constant_identifier_names, library_prefixes
 // ignore_for_file: non_constant_identifier_names, prefer_final_fields
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+

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

@@ -17,13 +17,7 @@ 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'},
   ],
 };
@@ -44,7 +38,7 @@ const TwonlySafeBackupEncrypted$json = {
 };
 
 /// Descriptor for `TwonlySafeBackupEncrypted`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List twonlySafeBackupEncryptedDescriptor =
+final $typed_data.Uint8List twonlySafeBackupEncryptedDescriptor = $convert.base64Decode(
-    $convert.base64Decode(
     'ChlUd29ubHlTYWZlQmFja3VwRW5jcnlwdGVkEhAKA21hYxgBIAEoDFIDbWFjEhQKBW5vbmNlGA'
     'IgASgMUgVub25jZRIeCgpjaXBoZXJUZXh0GAMgASgMUgpjaXBoZXJUZXh0');
+

lib/src/model/protobuf/backup/backup.pbserver.dart

@@ -11,3 +11,4 @@
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'backup.pb.dart';
+

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

@@ -41,57 +41,42 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
     return $result;
   }
   EncryptedPushNotification._() : super();
-  factory EncryptedPushNotification.fromBuffer($core.List<$core.int> i,
+  factory EncryptedPushNotification.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory EncryptedPushNotification.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      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(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EncryptedPushNotification', createEmptyInstance: create)
-      _omitMessageNames ? '' : 'EncryptedPushNotification',
-      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'keyId', protoName: 'keyId')
-    ..a<$core.List<$core.int>>(
+    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
-        2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(3, _omitFieldNames ? '' : 'ciphertext', $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
+    ..a<$core.List<$core.int>>(4, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
-        3, _omitFieldNames ? '' : 'ciphertext', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false
-    ..a<$core.List<$core.int>>(
+  ;
-        4, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  EncryptedPushNotification clone() =>
+  EncryptedPushNotification clone() => EncryptedPushNotification()..mergeFromMessage(this);
-      EncryptedPushNotification()..mergeFromMessage(this);
+  @$core.Deprecated(
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  EncryptedPushNotification copyWith(
+  EncryptedPushNotification copyWith(void Function(EncryptedPushNotification) updates) => super.copyWith((message) => updates(message as EncryptedPushNotification)) as EncryptedPushNotification;
-          void Function(EncryptedPushNotification) updates) =>
-      super.copyWith((message) => updates(message as EncryptedPushNotification))
-          as EncryptedPushNotification;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static EncryptedPushNotification create() => EncryptedPushNotification._();
   EncryptedPushNotification createEmptyInstance() => create();
-  static $pb.PbList<EncryptedPushNotification> createRepeated() =>
+  static $pb.PbList<EncryptedPushNotification> createRepeated() => $pb.PbList<EncryptedPushNotification>();
-      $pb.PbList<EncryptedPushNotification>();
   @$core.pragma('dart2js:noInline')
-  static EncryptedPushNotification getDefault() => _defaultInstance ??=
+  static EncryptedPushNotification getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EncryptedPushNotification>(create);
-      $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) {
+  set keyId($fixnum.Int64 v) { $_setInt64(0, v); }
-    $_setInt64(0, v);
-  }
-
   @$pb.TagNumber(1)
   $core.bool hasKeyId() => $_has(0);
   @$pb.TagNumber(1)
@@ -100,10 +85,7 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.List<$core.int> get nonce => $_getN(1);
   @$pb.TagNumber(2)
-  set nonce($core.List<$core.int> v) {
+  set nonce($core.List<$core.int> v) { $_setBytes(1, v); }
-    $_setBytes(1, v);
-  }
-
   @$pb.TagNumber(2)
   $core.bool hasNonce() => $_has(1);
   @$pb.TagNumber(2)
@@ -112,10 +94,7 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.List<$core.int> get ciphertext => $_getN(2);
   @$pb.TagNumber(3)
-  set ciphertext($core.List<$core.int> v) {
+  set ciphertext($core.List<$core.int> v) { $_setBytes(2, v); }
-    $_setBytes(2, v);
-  }
-
   @$pb.TagNumber(3)
   $core.bool hasCiphertext() => $_has(2);
   @$pb.TagNumber(3)
@@ -124,10 +103,7 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.List<$core.int> get mac => $_getN(3);
   @$pb.TagNumber(4)
-  set mac($core.List<$core.int> v) {
+  set mac($core.List<$core.int> v) { $_setBytes(3, v); }
-    $_setBytes(3, v);
-  }
-
   @$pb.TagNumber(4)
   $core.bool hasMac() => $_has(3);
   @$pb.TagNumber(4)
@@ -153,55 +129,41 @@ class PushNotification extends $pb.GeneratedMessage {
     return $result;
   }
   PushNotification._() : super();
-  factory PushNotification.fromBuffer($core.List<$core.int> i,
+  factory PushNotification.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory PushNotification.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      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(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PushNotification', createEmptyInstance: create)
-      _omitMessageNames ? '' : 'PushNotification',
+    ..e<PushKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE, defaultOrMaker: PushKind.reaction, valueOf: PushKind.valueOf, enumValues: PushKind.values)
-      createEmptyInstance: create)
-    ..e<PushKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE,
-        defaultOrMaker: PushKind.reaction,
-        valueOf: PushKind.valueOf,
-        enumValues: PushKind.values)
     ..aInt64(2, _omitFieldNames ? '' : 'messageId', protoName: 'messageId')
-    ..aOS(3, _omitFieldNames ? '' : 'reactionContent',
+    ..aOS(3, _omitFieldNames ? '' : 'reactionContent', protoName: 'reactionContent')
-        protoName: 'reactionContent')
+    ..hasRequiredFields = false
-    ..hasRequiredFields = false;
+  ;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  '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('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  PushNotification copyWith(void Function(PushNotification) updates) =>
+  PushNotification copyWith(void Function(PushNotification) updates) => super.copyWith((message) => updates(message as PushNotification)) as PushNotification;
-      super.copyWith((message) => updates(message as PushNotification))
-          as PushNotification;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
   static PushNotification create() => PushNotification._();
   PushNotification createEmptyInstance() => create();
-  static $pb.PbList<PushNotification> createRepeated() =>
+  static $pb.PbList<PushNotification> createRepeated() => $pb.PbList<PushNotification>();
-      $pb.PbList<PushNotification>();
   @$core.pragma('dart2js:noInline')
-  static PushNotification getDefault() => _defaultInstance ??=
+  static PushNotification getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushNotification>(create);
-      $pb.GeneratedMessage.$_defaultFor<PushNotification>(create);
   static PushNotification? _defaultInstance;
 
   @$pb.TagNumber(1)
   PushKind get kind => $_getN(0);
   @$pb.TagNumber(1)
-  set kind(PushKind v) {
+  set kind(PushKind v) { setField(1, v); }
-    setField(1, v);
-  }
-
   @$pb.TagNumber(1)
   $core.bool hasKind() => $_has(0);
   @$pb.TagNumber(1)
@@ -210,10 +172,7 @@ class PushNotification extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $fixnum.Int64 get messageId => $_getI64(1);
   @$pb.TagNumber(2)
-  set messageId($fixnum.Int64 v) {
+  set messageId($fixnum.Int64 v) { $_setInt64(1, v); }
-    $_setInt64(1, v);
-  }
-
   @$pb.TagNumber(2)
   $core.bool hasMessageId() => $_has(1);
   @$pb.TagNumber(2)
@@ -222,10 +181,7 @@ class PushNotification extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.String get reactionContent => $_getSZ(2);
   @$pb.TagNumber(3)
-  set reactionContent($core.String v) {
+  set reactionContent($core.String v) { $_setString(2, v); }
-    $_setString(2, v);
-  }
-
   @$pb.TagNumber(3)
   $core.bool hasReactionContent() => $_has(2);
   @$pb.TagNumber(3)
@@ -243,29 +199,24 @@ class PushUsers extends $pb.GeneratedMessage {
     return $result;
   }
   PushUsers._() : super();
-  factory PushUsers.fromBuffer($core.List<$core.int> i,
+  factory PushUsers.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory PushUsers.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      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(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PushUsers', createEmptyInstance: create)
-      _omitMessageNames ? '' : 'PushUsers',
+    ..pc<PushUser>(1, _omitFieldNames ? '' : 'users', $pb.PbFieldType.PM, subBuilder: PushUser.create)
-      createEmptyInstance: create)
+    ..hasRequiredFields = false
-    ..pc<PushUser>(1, _omitFieldNames ? '' : 'users', $pb.PbFieldType.PM,
+  ;
-        subBuilder: PushUser.create)
-    ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
   PushUsers clone() => PushUsers()..mergeFromMessage(this);
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  PushUsers copyWith(void Function(PushUsers) updates) =>
+  PushUsers copyWith(void Function(PushUsers) updates) => super.copyWith((message) => updates(message as PushUsers)) as PushUsers;
-      super.copyWith((message) => updates(message as PushUsers)) as PushUsers;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -274,8 +225,7 @@ class PushUsers extends $pb.GeneratedMessage {
   PushUsers createEmptyInstance() => create();
   static $pb.PbList<PushUsers> createRepeated() => $pb.PbList<PushUsers>();
   @$core.pragma('dart2js:noInline')
-  static PushUsers getDefault() =>
+  static PushUsers getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUsers>(create);
-      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUsers>(create);
   static PushUsers? _defaultInstance;
 
   @$pb.TagNumber(1)
@@ -309,34 +259,28 @@ class PushUser extends $pb.GeneratedMessage {
     return $result;
   }
   PushUser._() : super();
-  factory PushUser.fromBuffer($core.List<$core.int> i,
+  factory PushUser.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory PushUser.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      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(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PushUser', createEmptyInstance: create)
-      _omitMessageNames ? '' : 'PushUser',
-      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'userId', protoName: 'userId')
     ..aOS(2, _omitFieldNames ? '' : 'displayName', protoName: 'displayName')
     ..aOB(3, _omitFieldNames ? '' : 'blocked')
-    ..aInt64(4, _omitFieldNames ? '' : 'lastMessageId',
+    ..aInt64(4, _omitFieldNames ? '' : 'lastMessageId', protoName: '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('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  '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('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  PushUser copyWith(void Function(PushUser) updates) =>
+  PushUser copyWith(void Function(PushUser) updates) => super.copyWith((message) => updates(message as PushUser)) as PushUser;
-      super.copyWith((message) => updates(message as PushUser)) as PushUser;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -345,17 +289,13 @@ class PushUser extends $pb.GeneratedMessage {
   PushUser createEmptyInstance() => create();
   static $pb.PbList<PushUser> createRepeated() => $pb.PbList<PushUser>();
   @$core.pragma('dart2js:noInline')
-  static PushUser getDefault() =>
+  static PushUser getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUser>(create);
-      _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) {
+  set userId($fixnum.Int64 v) { $_setInt64(0, v); }
-    $_setInt64(0, v);
-  }
-
   @$pb.TagNumber(1)
   $core.bool hasUserId() => $_has(0);
   @$pb.TagNumber(1)
@@ -364,10 +304,7 @@ class PushUser extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.String get displayName => $_getSZ(1);
   @$pb.TagNumber(2)
-  set displayName($core.String v) {
+  set displayName($core.String v) { $_setString(1, v); }
-    $_setString(1, v);
-  }
-
   @$pb.TagNumber(2)
   $core.bool hasDisplayName() => $_has(1);
   @$pb.TagNumber(2)
@@ -376,10 +313,7 @@ class PushUser extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool get blocked => $_getBF(2);
   @$pb.TagNumber(3)
-  set blocked($core.bool v) {
+  set blocked($core.bool v) { $_setBool(2, v); }
-    $_setBool(2, v);
-  }
-
   @$pb.TagNumber(3)
   $core.bool hasBlocked() => $_has(2);
   @$pb.TagNumber(3)
@@ -388,10 +322,7 @@ class PushUser extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $fixnum.Int64 get lastMessageId => $_getI64(3);
   @$pb.TagNumber(4)
-  set lastMessageId($fixnum.Int64 v) {
+  set lastMessageId($fixnum.Int64 v) { $_setInt64(3, v); }
-    $_setInt64(3, v);
-  }
-
   @$pb.TagNumber(4)
   $core.bool hasLastMessageId() => $_has(3);
   @$pb.TagNumber(4)
@@ -420,32 +351,26 @@ class PushKey extends $pb.GeneratedMessage {
     return $result;
   }
   PushKey._() : super();
-  factory PushKey.fromBuffer($core.List<$core.int> i,
+  factory PushKey.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+  factory PushKey.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-      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(
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PushKey', createEmptyInstance: create)
-      _omitMessageNames ? '' : 'PushKey',
-      createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'id')
-    ..a<$core.List<$core.int>>(
+    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
-        2, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
+    ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp', protoName: 'createdAtUnixTimestamp')
-    ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp',
+    ..hasRequiredFields = false
-        protoName: 'createdAtUnixTimestamp')
+  ;
-    ..hasRequiredFields = false;
 
-  @$core.Deprecated('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  '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('Using this can add significant overhead to your binary. '
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  PushKey copyWith(void Function(PushKey) updates) =>
+  PushKey copyWith(void Function(PushKey) updates) => super.copyWith((message) => updates(message as PushKey)) as PushKey;
-      super.copyWith((message) => updates(message as PushKey)) as PushKey;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -454,17 +379,13 @@ class PushKey extends $pb.GeneratedMessage {
   PushKey createEmptyInstance() => create();
   static $pb.PbList<PushKey> createRepeated() => $pb.PbList<PushKey>();
   @$core.pragma('dart2js:noInline')
-  static PushKey getDefault() =>
+  static PushKey getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushKey>(create);
-      _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) {
+  set id($fixnum.Int64 v) { $_setInt64(0, v); }
-    $_setInt64(0, v);
-  }
-
   @$pb.TagNumber(1)
   $core.bool hasId() => $_has(0);
   @$pb.TagNumber(1)
@@ -473,10 +394,7 @@ class PushKey extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.List<$core.int> get key => $_getN(1);
   @$pb.TagNumber(2)
-  set key($core.List<$core.int> v) {
+  set key($core.List<$core.int> v) { $_setBytes(1, v); }
-    $_setBytes(1, v);
-  }
-
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
@@ -485,16 +403,13 @@ class PushKey extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $fixnum.Int64 get createdAtUnixTimestamp => $_getI64(2);
   @$pb.TagNumber(3)
-  set createdAtUnixTimestamp($fixnum.Int64 v) {
+  set createdAtUnixTimestamp($fixnum.Int64 v) { $_setInt64(2, v); }
-    $_setInt64(2, v);
-  }
-
   @$pb.TagNumber(3)
   $core.bool hasCreatedAtUnixTimestamp() => $_has(2);
   @$pb.TagNumber(3)
   void clearCreatedAtUnixTimestamp() => clearField(3);
 }
 
+
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames =
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
-    $core.bool.fromEnvironment('protobuf.omit_message_names');

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

@@ -14,30 +14,20 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class PushKind extends $pb.ProtobufEnum {
-  static const PushKind reaction =
+  static const PushKind reaction = PushKind._(0, _omitEnumNames ? '' : 'reaction');
-      PushKind._(0, _omitEnumNames ? '' : 'reaction');
+  static const PushKind response = PushKind._(1, _omitEnumNames ? '' : 'response');
-  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 =
+  static const PushKind contactRequest = PushKind._(6, _omitEnumNames ? '' : 'contactRequest');
-      PushKind._(6, _omitEnumNames ? '' : 'contactRequest');
+  static const PushKind acceptRequest = PushKind._(7, _omitEnumNames ? '' : 'acceptRequest');
-  static const PushKind acceptRequest =
+  static const PushKind storedMediaFile = PushKind._(8, _omitEnumNames ? '' : 'storedMediaFile');
-      PushKind._(7, _omitEnumNames ? '' : 'acceptRequest');
+  static const PushKind testNotification = PushKind._(9, _omitEnumNames ? '' : 'testNotification');
-  static const PushKind storedMediaFile =
+  static const PushKind reopenedMedia = PushKind._(10, _omitEnumNames ? '' : 'reopenedMedia');
-      PushKind._(8, _omitEnumNames ? '' : 'storedMediaFile');
+  static const PushKind reactionToVideo = PushKind._(11, _omitEnumNames ? '' : 'reactionToVideo');
-  static const PushKind testNotification =
+  static const PushKind reactionToText = PushKind._(12, _omitEnumNames ? '' : 'reactionToText');
-      PushKind._(9, _omitEnumNames ? '' : 'testNotification');
+  static const PushKind reactionToImage = PushKind._(13, _omitEnumNames ? '' : 'reactionToImage');
-  static const PushKind reopenedMedia =
-      PushKind._(10, _omitEnumNames ? '' : 'reopenedMedia');
-  static const PushKind reactionToVideo =
-      PushKind._(11, _omitEnumNames ? '' : 'reactionToVideo');
-  static const PushKind reactionToText =
-      PushKind._(12, _omitEnumNames ? '' : 'reactionToText');
-  static const PushKind reactionToImage =
-      PushKind._(13, _omitEnumNames ? '' : 'reactionToImage');
 
   static const $core.List<PushKind> values = <PushKind> [
     reaction,
@@ -56,11 +46,11 @@ class PushKind extends $pb.ProtobufEnum {
     reactionToImage,
   ];
 
-  static final $core.Map<$core.int, PushKind> _byValue =
+  static final $core.Map<$core.int, PushKind> _byValue = $pb.ProtobufEnum.initByValue(values);
-      $pb.ProtobufEnum.initByValue(values);
   static PushKind? valueOf($core.int value) => _byValue[value];
 
   const PushKind._($core.int v, $core.String n) : super(v, n);
 }
 
+
 const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

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

@@ -64,24 +64,8 @@ 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': 3, '9': 0, '10': 'messageId', '17': true},
-      '1': 'messageId',
+    {'1': 'reactionContent', '3': 3, '4': 1, '5': 9, '9': 1, '10': 'reactionContent', '17': true},
-      '3': 2,
-      '4': 1,
-      '5': 3,
-      '9': 0,
-      '10': 'messageId',
-      '17': true
-    },
-    {
-      '1': 'reactionContent',
-      '3': 3,
-      '4': 1,
-      '5': 9,
-      '9': 1,
-      '10': 'reactionContent',
-      '17': true
-    },
   ],
   '8': [
     {'1': '_messageId'},
@@ -114,23 +98,8 @@ 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': 3, '9': 0, '10': 'lastMessageId', '17': true},
-      '1': 'lastMessageId',
+    {'1': 'pushKeys', '3': 5, '4': 3, '5': 11, '6': '.PushKey', '10': 'pushKeys'},
-      '3': 4,
-      '4': 1,
-      '5': 3,
-      '9': 0,
-      '10': 'lastMessageId',
-      '17': true
-    },
-    {
-      '1': 'pushKeys',
-      '3': 5,
-      '4': 3,
-      '5': 11,
-      '6': '.PushKey',
-      '10': 'pushKeys'
-    },
   ],
   '8': [
     {'1': '_lastMessageId'},
@@ -150,13 +119,7 @@ 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'
-    },
   ],
 };
 
@@ -164,3 +127,4 @@ const PushKey$json = {
 final $typed_data.Uint8List pushKeyDescriptor = $convert.base64Decode(
     'CgdQdXNoS2V5Eg4KAmlkGAEgASgDUgJpZBIQCgNrZXkYAiABKAxSA2tleRI2ChZjcmVhdGVkQX'
     'RVbml4VGltZXN0YW1wGAMgASgDUhZjcmVhdGVkQXRVbml4VGltZXN0YW1w');
+

lib/src/model/protobuf/push_notification/push_notification.pbserver.dart

@@ -11,3 +11,4 @@
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'push_notification.pb.dart';
+