ios: maybe fixes black screen

dependencies

@@ -1 +1 @@
-Subproject commit 4e6d3eb9b7602030bf3d4b6dcb92ecc0f23de386
+Subproject commit e0c6a9617a20a8d6bc1ad4c6b9c2e229feb5f37a

ios/Podfile.lock

@@ -276,8 +276,6 @@ PODS:
     - nanopb/encode (= 3.30910.0)
   - nanopb/decode (3.30910.0)
   - nanopb/encode (3.30910.0)
-  - no_screenshot (0.10.0):
-    - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - permission_handler_apple (9.3.0):
@@ -289,6 +287,10 @@ PODS:
     - Flutter
   - rust_lib_twonly (0.0.1):
     - Flutter
+  - screen_protector (1.5.1):
+    - Flutter
+    - ScreenProtectorKit (= 1.5.1)
+  - ScreenProtectorKit (1.5.1)
   - SDWebImage (5.21.7):
     - SDWebImage/Core (= 5.21.7)
   - SDWebImage/Core (5.21.7)
@@ -351,12 +353,12 @@ DEPENDENCIES:
   - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
-  - no_screenshot (from `.symlinks/plugins/no_screenshot/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - pro_video_editor (from `.symlinks/plugins/pro_video_editor/ios`)
   - restart_app (from `.symlinks/plugins/restart_app/ios`)
   - rust_lib_twonly (from `.symlinks/plugins/rust_lib_twonly/ios`)
+  - screen_protector (from `.symlinks/plugins/screen_protector/ios`)
   - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -392,6 +394,7 @@ SPEC REPOS:
     - MLKitVision
     - nanopb
     - PromisesObjC
+    - ScreenProtectorKit
     - SDWebImage
     - SDWebImageWebPCoder
     - Sentry
@@ -453,8 +456,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/integration_test/ios"
   local_auth_darwin:
     :path: ".symlinks/plugins/local_auth_darwin/darwin"
-  no_screenshot:
-    :path: ".symlinks/plugins/no_screenshot/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   permission_handler_apple:
@@ -465,6 +466,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/restart_app/ios"
   rust_lib_twonly:
     :path: ".symlinks/plugins/rust_lib_twonly/ios"
+  screen_protector:
+    :path: ".symlinks/plugins/screen_protector/ios"
   sentry_flutter:
     :path: ".symlinks/plugins/sentry_flutter/ios"
   share_plus:
@@ -531,13 +534,14 @@ SPEC CHECKSUMS:
   MLKitFaceDetection: 32549f1e70e6e7731261bf9cea2b74095e2531cb
   MLKitVision: 39a5a812db83c4a0794445088e567f3631c11961
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  no_screenshot: 03c8ac6586f9652cd45e3d12d74e5992256403ac
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   pro_video_editor: 44ef9a6d48dbd757ed428cf35396dd05f35c7830
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   restart_app: 0714144901e260eae68f7afc2fc4aacc1a323ad2
   rust_lib_twonly: 73165b05d0cda50db45852db63f49caa7f319520
+  screen_protector: 18c6aca2dc5d2a832f6787a5318f97f03e9d3150
+  ScreenProtectorKit: 6ceb3e0808341a9bc15d175bff40dfdd4b32da71
   SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
   SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377
   Sentry: d587a8fe91ca13503ecd69a1905f3e8a0fcf61be

lib/app.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
@@ -130,6 +131,7 @@ class _AppMainWidgetState extends State<AppMainWidget> {
 
   Future<void> initAsync() async {
     if (userService.isUserCreated) {
+      await FirebaseMessaging.instance.requestPermission();
       if (_isTwonlyLocked) {
         // do not change in case twonly was already unlocked at some point
         _isTwonlyLocked = userService.currentUser.screenLockEnabled;

lib/main.dart

@@ -55,7 +55,7 @@ Future<void> twonlyMinimumInitialization() async {
 void main() async {
   await twonlyMinimumInitialization();
 
-  await initFCMService();
+  unawaited(initFCMService());
 
   var userExists = false;
   var storageError = false;

lib/src/callbacks/logging.callbacks.dart

@@ -19,7 +19,7 @@ class LoggingCallbacks {
               print(log);
             }
           },
-          onDone: () => Log.error('Log stream closed'),
+          onDone: () => Log.info('Log stream closed'),
         );
         timer.cancel();
       } catch (e) {

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -51,7 +51,7 @@ class TextMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  TextMessage clone() => TextMessage()..mergeFromMessage(this);
+  TextMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   TextMessage copyWith(void Function(TextMessage) updates) =>
       super.copyWith((message) => updates(message as TextMessage))
@@ -64,7 +64,6 @@ class TextMessage extends $pb.GeneratedMessage {
   static TextMessage create() => TextMessage._();
   @$core.override
   TextMessage createEmptyInstance() => create();
-  static $pb.PbList<TextMessage> createRepeated() => $pb.PbList<TextMessage>();
   @$core.pragma('dart2js:noInline')
   static TextMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<TextMessage>(create);
@@ -129,13 +128,12 @@ class UploadRequest extends $pb.GeneratedMessage {
         1, _omitFieldNames ? '' : 'encryptedData', $pb.PbFieldType.OY)
     ..p<$core.List<$core.int>>(
         2, _omitFieldNames ? '' : 'downloadTokens', $pb.PbFieldType.PY)
-    ..pc<TextMessage>(
+    ..pPM<TextMessage>(3, _omitFieldNames ? '' : 'messagesOnSuccess',
-        3, _omitFieldNames ? '' : 'messagesOnSuccess', $pb.PbFieldType.PM,
         subBuilder: TextMessage.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UploadRequest clone() => UploadRequest()..mergeFromMessage(this);
+  UploadRequest clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UploadRequest copyWith(void Function(UploadRequest) updates) =>
       super.copyWith((message) => updates(message as UploadRequest))
@@ -148,8 +146,6 @@ class UploadRequest extends $pb.GeneratedMessage {
   static UploadRequest create() => UploadRequest._();
   @$core.override
   UploadRequest createEmptyInstance() => create();
-  static $pb.PbList<UploadRequest> createRepeated() =>
-      $pb.PbList<UploadRequest>();
   @$core.pragma('dart2js:noInline')
   static UploadRequest getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<UploadRequest>(create);
@@ -220,8 +216,7 @@ class UpdateGroupState_UpdateTBS extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UpdateGroupState_UpdateTBS clone() =>
+  UpdateGroupState_UpdateTBS clone() => deepCopy();
-      UpdateGroupState_UpdateTBS()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UpdateGroupState_UpdateTBS copyWith(
           void Function(UpdateGroupState_UpdateTBS) updates) =>
@@ -236,8 +231,6 @@ class UpdateGroupState_UpdateTBS extends $pb.GeneratedMessage {
   static UpdateGroupState_UpdateTBS create() => UpdateGroupState_UpdateTBS._();
   @$core.override
   UpdateGroupState_UpdateTBS createEmptyInstance() => create();
-  static $pb.PbList<UpdateGroupState_UpdateTBS> createRepeated() =>
-      $pb.PbList<UpdateGroupState_UpdateTBS>();
   @$core.pragma('dart2js:noInline')
   static UpdateGroupState_UpdateTBS getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<UpdateGroupState_UpdateTBS>(create);
@@ -331,7 +324,7 @@ class UpdateGroupState extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UpdateGroupState clone() => UpdateGroupState()..mergeFromMessage(this);
+  UpdateGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UpdateGroupState copyWith(void Function(UpdateGroupState) updates) =>
       super.copyWith((message) => updates(message as UpdateGroupState))
@@ -344,8 +337,6 @@ class UpdateGroupState extends $pb.GeneratedMessage {
   static UpdateGroupState create() => UpdateGroupState._();
   @$core.override
   UpdateGroupState createEmptyInstance() => create();
-  static $pb.PbList<UpdateGroupState> createRepeated() =>
-      $pb.PbList<UpdateGroupState>();
   @$core.pragma('dart2js:noInline')
   static UpdateGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<UpdateGroupState>(create);
@@ -412,7 +403,7 @@ class NewGroupState extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  NewGroupState clone() => NewGroupState()..mergeFromMessage(this);
+  NewGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   NewGroupState copyWith(void Function(NewGroupState) updates) =>
       super.copyWith((message) => updates(message as NewGroupState))
@@ -425,8 +416,6 @@ class NewGroupState extends $pb.GeneratedMessage {
   static NewGroupState create() => NewGroupState._();
   @$core.override
   NewGroupState createEmptyInstance() => create();
-  static $pb.PbList<NewGroupState> createRepeated() =>
-      $pb.PbList<NewGroupState>();
   @$core.pragma('dart2js:noInline')
   static NewGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<NewGroupState>(create);
@@ -508,8 +497,7 @@ class AppendGroupState_AppendTBS extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppendGroupState_AppendTBS clone() =>
+  AppendGroupState_AppendTBS clone() => deepCopy();
-      AppendGroupState_AppendTBS()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   AppendGroupState_AppendTBS copyWith(
           void Function(AppendGroupState_AppendTBS) updates) =>
@@ -524,8 +512,6 @@ class AppendGroupState_AppendTBS extends $pb.GeneratedMessage {
   static AppendGroupState_AppendTBS create() => AppendGroupState_AppendTBS._();
   @$core.override
   AppendGroupState_AppendTBS createEmptyInstance() => create();
-  static $pb.PbList<AppendGroupState_AppendTBS> createRepeated() =>
-      $pb.PbList<AppendGroupState_AppendTBS>();
   @$core.pragma('dart2js:noInline')
   static AppendGroupState_AppendTBS getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<AppendGroupState_AppendTBS>(create);
@@ -605,7 +591,7 @@ class AppendGroupState extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppendGroupState clone() => AppendGroupState()..mergeFromMessage(this);
+  AppendGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   AppendGroupState copyWith(void Function(AppendGroupState) updates) =>
       super.copyWith((message) => updates(message as AppendGroupState))
@@ -618,8 +604,6 @@ class AppendGroupState extends $pb.GeneratedMessage {
   static AppendGroupState create() => AppendGroupState._();
   @$core.override
   AppendGroupState createEmptyInstance() => create();
-  static $pb.PbList<AppendGroupState> createRepeated() =>
-      $pb.PbList<AppendGroupState>();
   @$core.pragma('dart2js:noInline')
   static AppendGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<AppendGroupState>(create);
@@ -688,13 +672,12 @@ class GroupState extends $pb.GeneratedMessage {
         defaultOrMaker: $fixnum.Int64.ZERO)
     ..a<$core.List<$core.int>>(
         2, _omitFieldNames ? '' : 'encryptedGroupState', $pb.PbFieldType.OY)
-    ..pc<AppendGroupState>(
+    ..pPM<AppendGroupState>(3, _omitFieldNames ? '' : 'appendedGroupStates',
-        3, _omitFieldNames ? '' : 'appendedGroupStates', $pb.PbFieldType.PM,
         subBuilder: AppendGroupState.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  GroupState clone() => GroupState()..mergeFromMessage(this);
+  GroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   GroupState copyWith(void Function(GroupState) updates) =>
       super.copyWith((message) => updates(message as GroupState)) as GroupState;
@@ -706,7 +689,6 @@ class GroupState extends $pb.GeneratedMessage {
   static GroupState create() => GroupState._();
   @$core.override
   GroupState createEmptyInstance() => create();
-  static $pb.PbList<GroupState> createRepeated() => $pb.PbList<GroupState>();
   @$core.pragma('dart2js:noInline')
   static GroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<GroupState>(create);
@@ -758,14 +740,12 @@ class AppendGroupStateHelper extends $pb.GeneratedMessage {
       _omitMessageNames ? '' : 'AppendGroupStateHelper',
       package: const $pb.PackageName(_omitMessageNames ? '' : 'http_requests'),
       createEmptyInstance: create)
-    ..pc<AppendGroupState>(
+    ..pPM<AppendGroupState>(1, _omitFieldNames ? '' : 'appendedGroupStates',
-        1, _omitFieldNames ? '' : 'appendedGroupStates', $pb.PbFieldType.PM,
         subBuilder: AppendGroupState.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppendGroupStateHelper clone() =>
+  AppendGroupStateHelper clone() => deepCopy();
-      AppendGroupStateHelper()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   AppendGroupStateHelper copyWith(
           void Function(AppendGroupStateHelper) updates) =>
@@ -779,8 +759,6 @@ class AppendGroupStateHelper extends $pb.GeneratedMessage {
   static AppendGroupStateHelper create() => AppendGroupStateHelper._();
   @$core.override
   AppendGroupStateHelper createEmptyInstance() => create();
-  static $pb.PbList<AppendGroupStateHelper> createRepeated() =>
-      $pb.PbList<AppendGroupStateHelper>();
   @$core.pragma('dart2js:noInline')
   static AppendGroupStateHelper getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<AppendGroupStateHelper>(create);

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

@@ -8,4 +8,4 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -54,7 +54,7 @@ class ClientToServer extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ClientToServer clone() => ClientToServer()..mergeFromMessage(this);
+  ClientToServer clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ClientToServer copyWith(void Function(ClientToServer) updates) =>
       super.copyWith((message) => updates(message as ClientToServer))
@@ -67,14 +67,14 @@ class ClientToServer extends $pb.GeneratedMessage {
   static ClientToServer create() => ClientToServer._();
   @$core.override
   ClientToServer createEmptyInstance() => create();
-  static $pb.PbList<ClientToServer> createRepeated() =>
-      $pb.PbList<ClientToServer>();
   @$core.pragma('dart2js:noInline')
   static ClientToServer getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ClientToServer>(create);
   static ClientToServer? _defaultInstance;
 
+  @$pb.TagNumber(1)
   ClientToServer_V whichV() => _ClientToServer_VByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
   void clearV() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -138,7 +138,7 @@ class V0 extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  V0 clone() => V0()..mergeFromMessage(this);
+  V0 clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   V0 copyWith(void Function(V0) updates) =>
       super.copyWith((message) => updates(message as V0)) as V0;
@@ -150,13 +150,18 @@ class V0 extends $pb.GeneratedMessage {
   static V0 create() => V0._();
   @$core.override
   V0 createEmptyInstance() => create();
-  static $pb.PbList<V0> createRepeated() => $pb.PbList<V0>();
   @$core.pragma('dart2js:noInline')
   static V0 getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<V0>(create);
   static V0? _defaultInstance;
 
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
   V0_Kind whichKind() => _V0_KindByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
   void clearKind() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -222,8 +227,7 @@ class Handshake_RequestPOW extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_RequestPOW clone() =>
+  Handshake_RequestPOW clone() => deepCopy();
-      Handshake_RequestPOW()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_RequestPOW copyWith(void Function(Handshake_RequestPOW) updates) =>
       super.copyWith((message) => updates(message as Handshake_RequestPOW))
@@ -236,8 +240,6 @@ class Handshake_RequestPOW extends $pb.GeneratedMessage {
   static Handshake_RequestPOW create() => Handshake_RequestPOW._();
   @$core.override
   Handshake_RequestPOW createEmptyInstance() => create();
-  static $pb.PbList<Handshake_RequestPOW> createRepeated() =>
-      $pb.PbList<Handshake_RequestPOW>();
   @$core.pragma('dart2js:noInline')
   static Handshake_RequestPOW getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_RequestPOW>(create);
@@ -302,7 +304,7 @@ class Handshake_Register extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_Register clone() => Handshake_Register()..mergeFromMessage(this);
+  Handshake_Register clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_Register copyWith(void Function(Handshake_Register) updates) =>
       super.copyWith((message) => updates(message as Handshake_Register))
@@ -315,8 +317,6 @@ class Handshake_Register extends $pb.GeneratedMessage {
   static Handshake_Register create() => Handshake_Register._();
   @$core.override
   Handshake_Register createEmptyInstance() => create();
-  static $pb.PbList<Handshake_Register> createRepeated() =>
-      $pb.PbList<Handshake_Register>();
   @$core.pragma('dart2js:noInline')
   static Handshake_Register getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_Register>(create);
@@ -434,8 +434,7 @@ class Handshake_GetAuthChallenge extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_GetAuthChallenge clone() =>
+  Handshake_GetAuthChallenge clone() => deepCopy();
-      Handshake_GetAuthChallenge()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_GetAuthChallenge copyWith(
           void Function(Handshake_GetAuthChallenge) updates) =>
@@ -450,8 +449,6 @@ class Handshake_GetAuthChallenge extends $pb.GeneratedMessage {
   static Handshake_GetAuthChallenge create() => Handshake_GetAuthChallenge._();
   @$core.override
   Handshake_GetAuthChallenge createEmptyInstance() => create();
-  static $pb.PbList<Handshake_GetAuthChallenge> createRepeated() =>
-      $pb.PbList<Handshake_GetAuthChallenge>();
   @$core.pragma('dart2js:noInline')
   static Handshake_GetAuthChallenge getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_GetAuthChallenge>(create);
@@ -489,8 +486,7 @@ class Handshake_GetAuthToken extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_GetAuthToken clone() =>
+  Handshake_GetAuthToken clone() => deepCopy();
-      Handshake_GetAuthToken()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_GetAuthToken copyWith(
           void Function(Handshake_GetAuthToken) updates) =>
@@ -504,8 +500,6 @@ class Handshake_GetAuthToken extends $pb.GeneratedMessage {
   static Handshake_GetAuthToken create() => Handshake_GetAuthToken._();
   @$core.override
   Handshake_GetAuthToken createEmptyInstance() => create();
-  static $pb.PbList<Handshake_GetAuthToken> createRepeated() =>
-      $pb.PbList<Handshake_GetAuthToken>();
   @$core.pragma('dart2js:noInline')
   static Handshake_GetAuthToken getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_GetAuthToken>(create);
@@ -570,8 +564,7 @@ class Handshake_Authenticate extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_Authenticate clone() =>
+  Handshake_Authenticate clone() => deepCopy();
-      Handshake_Authenticate()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_Authenticate copyWith(
           void Function(Handshake_Authenticate) updates) =>
@@ -585,8 +578,6 @@ class Handshake_Authenticate extends $pb.GeneratedMessage {
   static Handshake_Authenticate create() => Handshake_Authenticate._();
   @$core.override
   Handshake_Authenticate createEmptyInstance() => create();
-  static $pb.PbList<Handshake_Authenticate> createRepeated() =>
-      $pb.PbList<Handshake_Authenticate>();
   @$core.pragma('dart2js:noInline')
   static Handshake_Authenticate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_Authenticate>(create);
@@ -703,7 +694,7 @@ class Handshake extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake clone() => Handshake()..mergeFromMessage(this);
+  Handshake clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake copyWith(void Function(Handshake) updates) =>
       super.copyWith((message) => updates(message as Handshake)) as Handshake;
@@ -715,14 +706,23 @@ class Handshake extends $pb.GeneratedMessage {
   static Handshake create() => Handshake._();
   @$core.override
   Handshake createEmptyInstance() => create();
-  static $pb.PbList<Handshake> createRepeated() => $pb.PbList<Handshake>();
   @$core.pragma('dart2js:noInline')
   static Handshake getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Handshake>(create);
   static Handshake? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
   Handshake_Handshake whichHandshake() =>
       _Handshake_HandshakeByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
   void clearHandshake() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -817,8 +817,7 @@ class ApplicationData_TextMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_TextMessage clone() =>
+  ApplicationData_TextMessage clone() => deepCopy();
-      ApplicationData_TextMessage()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_TextMessage copyWith(
           void Function(ApplicationData_TextMessage) updates) =>
@@ -834,8 +833,6 @@ class ApplicationData_TextMessage extends $pb.GeneratedMessage {
       ApplicationData_TextMessage._();
   @$core.override
   ApplicationData_TextMessage createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_TextMessage> createRepeated() =>
-      $pb.PbList<ApplicationData_TextMessage>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_TextMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_TextMessage>(create);
@@ -897,8 +894,7 @@ class ApplicationData_GetUserByUsername extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetUserByUsername clone() =>
+  ApplicationData_GetUserByUsername clone() => deepCopy();
-      ApplicationData_GetUserByUsername()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetUserByUsername copyWith(
           void Function(ApplicationData_GetUserByUsername) updates) =>
@@ -914,8 +910,6 @@ class ApplicationData_GetUserByUsername extends $pb.GeneratedMessage {
       ApplicationData_GetUserByUsername._();
   @$core.override
   ApplicationData_GetUserByUsername createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetUserByUsername> createRepeated() =>
-      $pb.PbList<ApplicationData_GetUserByUsername>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetUserByUsername getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetUserByUsername>(
@@ -959,8 +953,7 @@ class ApplicationData_ChangeUsername extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_ChangeUsername clone() =>
+  ApplicationData_ChangeUsername clone() => deepCopy();
-      ApplicationData_ChangeUsername()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_ChangeUsername copyWith(
           void Function(ApplicationData_ChangeUsername) updates) =>
@@ -976,8 +969,6 @@ class ApplicationData_ChangeUsername extends $pb.GeneratedMessage {
       ApplicationData_ChangeUsername._();
   @$core.override
   ApplicationData_ChangeUsername createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_ChangeUsername> createRepeated() =>
-      $pb.PbList<ApplicationData_ChangeUsername>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_ChangeUsername getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_ChangeUsername>(create);
@@ -1021,8 +1012,7 @@ class ApplicationData_UpdateGoogleFcmToken extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_UpdateGoogleFcmToken clone() =>
+  ApplicationData_UpdateGoogleFcmToken clone() => deepCopy();
-      ApplicationData_UpdateGoogleFcmToken()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_UpdateGoogleFcmToken copyWith(
           void Function(ApplicationData_UpdateGoogleFcmToken) updates) =>
@@ -1038,8 +1028,6 @@ class ApplicationData_UpdateGoogleFcmToken extends $pb.GeneratedMessage {
       ApplicationData_UpdateGoogleFcmToken._();
   @$core.override
   ApplicationData_UpdateGoogleFcmToken createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_UpdateGoogleFcmToken> createRepeated() =>
-      $pb.PbList<ApplicationData_UpdateGoogleFcmToken>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_UpdateGoogleFcmToken getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1083,8 +1071,7 @@ class ApplicationData_GetUserById extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetUserById clone() =>
+  ApplicationData_GetUserById clone() => deepCopy();
-      ApplicationData_GetUserById()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetUserById copyWith(
           void Function(ApplicationData_GetUserById) updates) =>
@@ -1100,8 +1087,6 @@ class ApplicationData_GetUserById extends $pb.GeneratedMessage {
       ApplicationData_GetUserById._();
   @$core.override
   ApplicationData_GetUserById createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetUserById> createRepeated() =>
-      $pb.PbList<ApplicationData_GetUserById>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetUserById getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetUserById>(create);
@@ -1144,8 +1129,7 @@ class ApplicationData_RedeemVoucher extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_RedeemVoucher clone() =>
+  ApplicationData_RedeemVoucher clone() => deepCopy();
-      ApplicationData_RedeemVoucher()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_RedeemVoucher copyWith(
           void Function(ApplicationData_RedeemVoucher) updates) =>
@@ -1161,8 +1145,6 @@ class ApplicationData_RedeemVoucher extends $pb.GeneratedMessage {
       ApplicationData_RedeemVoucher._();
   @$core.override
   ApplicationData_RedeemVoucher createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_RedeemVoucher> createRepeated() =>
-      $pb.PbList<ApplicationData_RedeemVoucher>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_RedeemVoucher getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_RedeemVoucher>(create);
@@ -1212,8 +1194,7 @@ class ApplicationData_SwitchToPayedPlan extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_SwitchToPayedPlan clone() =>
+  ApplicationData_SwitchToPayedPlan clone() => deepCopy();
-      ApplicationData_SwitchToPayedPlan()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_SwitchToPayedPlan copyWith(
           void Function(ApplicationData_SwitchToPayedPlan) updates) =>
@@ -1229,8 +1210,6 @@ class ApplicationData_SwitchToPayedPlan extends $pb.GeneratedMessage {
       ApplicationData_SwitchToPayedPlan._();
   @$core.override
   ApplicationData_SwitchToPayedPlan createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_SwitchToPayedPlan> createRepeated() =>
-      $pb.PbList<ApplicationData_SwitchToPayedPlan>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_SwitchToPayedPlan getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_SwitchToPayedPlan>(
@@ -1293,8 +1272,7 @@ class ApplicationData_UpdatePlanOptions extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_UpdatePlanOptions clone() =>
+  ApplicationData_UpdatePlanOptions clone() => deepCopy();
-      ApplicationData_UpdatePlanOptions()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_UpdatePlanOptions copyWith(
           void Function(ApplicationData_UpdatePlanOptions) updates) =>
@@ -1310,8 +1288,6 @@ class ApplicationData_UpdatePlanOptions extends $pb.GeneratedMessage {
       ApplicationData_UpdatePlanOptions._();
   @$core.override
   ApplicationData_UpdatePlanOptions createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_UpdatePlanOptions> createRepeated() =>
-      $pb.PbList<ApplicationData_UpdatePlanOptions>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_UpdatePlanOptions getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_UpdatePlanOptions>(
@@ -1351,12 +1327,11 @@ class ApplicationData_CreateVoucher extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'client_to_server'),
       createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'valueCents', $pb.PbFieldType.OU3)
+    ..aI(1, _omitFieldNames ? '' : 'valueCents', fieldType: $pb.PbFieldType.OU3)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_CreateVoucher clone() =>
+  ApplicationData_CreateVoucher clone() => deepCopy();
-      ApplicationData_CreateVoucher()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_CreateVoucher copyWith(
           void Function(ApplicationData_CreateVoucher) updates) =>
@@ -1372,8 +1347,6 @@ class ApplicationData_CreateVoucher extends $pb.GeneratedMessage {
       ApplicationData_CreateVoucher._();
   @$core.override
   ApplicationData_CreateVoucher createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_CreateVoucher> createRepeated() =>
-      $pb.PbList<ApplicationData_CreateVoucher>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_CreateVoucher getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_CreateVoucher>(create);
@@ -1409,8 +1382,7 @@ class ApplicationData_GetLocation extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetLocation clone() =>
+  ApplicationData_GetLocation clone() => deepCopy();
-      ApplicationData_GetLocation()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetLocation copyWith(
           void Function(ApplicationData_GetLocation) updates) =>
@@ -1426,8 +1398,6 @@ class ApplicationData_GetLocation extends $pb.GeneratedMessage {
       ApplicationData_GetLocation._();
   @$core.override
   ApplicationData_GetLocation createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetLocation> createRepeated() =>
-      $pb.PbList<ApplicationData_GetLocation>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetLocation getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetLocation>(create);
@@ -1454,8 +1424,7 @@ class ApplicationData_GetVouchers extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetVouchers clone() =>
+  ApplicationData_GetVouchers clone() => deepCopy();
-      ApplicationData_GetVouchers()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetVouchers copyWith(
           void Function(ApplicationData_GetVouchers) updates) =>
@@ -1471,8 +1440,6 @@ class ApplicationData_GetVouchers extends $pb.GeneratedMessage {
       ApplicationData_GetVouchers._();
   @$core.override
   ApplicationData_GetVouchers createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetVouchers> createRepeated() =>
-      $pb.PbList<ApplicationData_GetVouchers>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetVouchers getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetVouchers>(create);
@@ -1500,8 +1467,7 @@ class ApplicationData_GetAvailablePlans extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetAvailablePlans clone() =>
+  ApplicationData_GetAvailablePlans clone() => deepCopy();
-      ApplicationData_GetAvailablePlans()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetAvailablePlans copyWith(
           void Function(ApplicationData_GetAvailablePlans) updates) =>
@@ -1517,8 +1483,6 @@ class ApplicationData_GetAvailablePlans extends $pb.GeneratedMessage {
       ApplicationData_GetAvailablePlans._();
   @$core.override
   ApplicationData_GetAvailablePlans createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetAvailablePlans> createRepeated() =>
-      $pb.PbList<ApplicationData_GetAvailablePlans>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetAvailablePlans getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetAvailablePlans>(
@@ -1547,8 +1511,7 @@ class ApplicationData_GetAddAccountsInvites extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetAddAccountsInvites clone() =>
+  ApplicationData_GetAddAccountsInvites clone() => deepCopy();
-      ApplicationData_GetAddAccountsInvites()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetAddAccountsInvites copyWith(
           void Function(ApplicationData_GetAddAccountsInvites) updates) =>
@@ -1564,8 +1527,6 @@ class ApplicationData_GetAddAccountsInvites extends $pb.GeneratedMessage {
       ApplicationData_GetAddAccountsInvites._();
   @$core.override
   ApplicationData_GetAddAccountsInvites createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetAddAccountsInvites> createRepeated() =>
-      $pb.PbList<ApplicationData_GetAddAccountsInvites>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetAddAccountsInvites getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1594,8 +1555,7 @@ class ApplicationData_GetCurrentPlanInfos extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetCurrentPlanInfos clone() =>
+  ApplicationData_GetCurrentPlanInfos clone() => deepCopy();
-      ApplicationData_GetCurrentPlanInfos()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetCurrentPlanInfos copyWith(
           void Function(ApplicationData_GetCurrentPlanInfos) updates) =>
@@ -1611,8 +1571,6 @@ class ApplicationData_GetCurrentPlanInfos extends $pb.GeneratedMessage {
       ApplicationData_GetCurrentPlanInfos._();
   @$core.override
   ApplicationData_GetCurrentPlanInfos createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetCurrentPlanInfos> createRepeated() =>
-      $pb.PbList<ApplicationData_GetCurrentPlanInfos>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetCurrentPlanInfos getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1648,8 +1606,7 @@ class ApplicationData_RedeemAdditionalCode extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_RedeemAdditionalCode clone() =>
+  ApplicationData_RedeemAdditionalCode clone() => deepCopy();
-      ApplicationData_RedeemAdditionalCode()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_RedeemAdditionalCode copyWith(
           void Function(ApplicationData_RedeemAdditionalCode) updates) =>
@@ -1665,8 +1622,6 @@ class ApplicationData_RedeemAdditionalCode extends $pb.GeneratedMessage {
       ApplicationData_RedeemAdditionalCode._();
   @$core.override
   ApplicationData_RedeemAdditionalCode createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_RedeemAdditionalCode> createRepeated() =>
-      $pb.PbList<ApplicationData_RedeemAdditionalCode>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_RedeemAdditionalCode getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1711,8 +1666,7 @@ class ApplicationData_RemoveAdditionalUser extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_RemoveAdditionalUser clone() =>
+  ApplicationData_RemoveAdditionalUser clone() => deepCopy();
-      ApplicationData_RemoveAdditionalUser()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_RemoveAdditionalUser copyWith(
           void Function(ApplicationData_RemoveAdditionalUser) updates) =>
@@ -1728,8 +1682,6 @@ class ApplicationData_RemoveAdditionalUser extends $pb.GeneratedMessage {
       ApplicationData_RemoveAdditionalUser._();
   @$core.override
   ApplicationData_RemoveAdditionalUser createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_RemoveAdditionalUser> createRepeated() =>
-      $pb.PbList<ApplicationData_RemoveAdditionalUser>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_RemoveAdditionalUser getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1774,8 +1726,7 @@ class ApplicationData_GetPrekeysByUserId extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetPrekeysByUserId clone() =>
+  ApplicationData_GetPrekeysByUserId clone() => deepCopy();
-      ApplicationData_GetPrekeysByUserId()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetPrekeysByUserId copyWith(
           void Function(ApplicationData_GetPrekeysByUserId) updates) =>
@@ -1791,8 +1742,6 @@ class ApplicationData_GetPrekeysByUserId extends $pb.GeneratedMessage {
       ApplicationData_GetPrekeysByUserId._();
   @$core.override
   ApplicationData_GetPrekeysByUserId createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetPrekeysByUserId> createRepeated() =>
-      $pb.PbList<ApplicationData_GetPrekeysByUserId>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetPrekeysByUserId getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetPrekeysByUserId>(
@@ -1837,8 +1786,7 @@ class ApplicationData_GetSignedPreKeyByUserId extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetSignedPreKeyByUserId clone() =>
+  ApplicationData_GetSignedPreKeyByUserId clone() => deepCopy();
-      ApplicationData_GetSignedPreKeyByUserId()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetSignedPreKeyByUserId copyWith(
           void Function(ApplicationData_GetSignedPreKeyByUserId) updates) =>
@@ -1854,8 +1802,6 @@ class ApplicationData_GetSignedPreKeyByUserId extends $pb.GeneratedMessage {
       ApplicationData_GetSignedPreKeyByUserId._();
   @$core.override
   ApplicationData_GetSignedPreKeyByUserId createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetSignedPreKeyByUserId> createRepeated() =>
-      $pb.PbList<ApplicationData_GetSignedPreKeyByUserId>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetSignedPreKeyByUserId getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1909,8 +1855,7 @@ class ApplicationData_UpdateSignedPreKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_UpdateSignedPreKey clone() =>
+  ApplicationData_UpdateSignedPreKey clone() => deepCopy();
-      ApplicationData_UpdateSignedPreKey()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_UpdateSignedPreKey copyWith(
           void Function(ApplicationData_UpdateSignedPreKey) updates) =>
@@ -1926,8 +1871,6 @@ class ApplicationData_UpdateSignedPreKey extends $pb.GeneratedMessage {
       ApplicationData_UpdateSignedPreKey._();
   @$core.override
   ApplicationData_UpdateSignedPreKey createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_UpdateSignedPreKey> createRepeated() =>
-      $pb.PbList<ApplicationData_UpdateSignedPreKey>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_UpdateSignedPreKey getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_UpdateSignedPreKey>(
@@ -1991,8 +1934,7 @@ class ApplicationData_DownloadDone extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_DownloadDone clone() =>
+  ApplicationData_DownloadDone clone() => deepCopy();
-      ApplicationData_DownloadDone()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_DownloadDone copyWith(
           void Function(ApplicationData_DownloadDone) updates) =>
@@ -2008,8 +1950,6 @@ class ApplicationData_DownloadDone extends $pb.GeneratedMessage {
       ApplicationData_DownloadDone._();
   @$core.override
   ApplicationData_DownloadDone createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_DownloadDone> createRepeated() =>
-      $pb.PbList<ApplicationData_DownloadDone>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_DownloadDone getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_DownloadDone>(create);
@@ -2055,8 +1995,7 @@ class ApplicationData_ReportUser extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_ReportUser clone() =>
+  ApplicationData_ReportUser clone() => deepCopy();
-      ApplicationData_ReportUser()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_ReportUser copyWith(
           void Function(ApplicationData_ReportUser) updates) =>
@@ -2071,8 +2010,6 @@ class ApplicationData_ReportUser extends $pb.GeneratedMessage {
   static ApplicationData_ReportUser create() => ApplicationData_ReportUser._();
   @$core.override
   ApplicationData_ReportUser createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_ReportUser> createRepeated() =>
-      $pb.PbList<ApplicationData_ReportUser>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_ReportUser getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_ReportUser>(create);
@@ -2130,8 +2067,7 @@ class ApplicationData_IPAPurchase extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_IPAPurchase clone() =>
+  ApplicationData_IPAPurchase clone() => deepCopy();
-      ApplicationData_IPAPurchase()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_IPAPurchase copyWith(
           void Function(ApplicationData_IPAPurchase) updates) =>
@@ -2147,8 +2083,6 @@ class ApplicationData_IPAPurchase extends $pb.GeneratedMessage {
       ApplicationData_IPAPurchase._();
   @$core.override
   ApplicationData_IPAPurchase createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_IPAPurchase> createRepeated() =>
-      $pb.PbList<ApplicationData_IPAPurchase>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_IPAPurchase getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_IPAPurchase>(create);
@@ -2202,8 +2136,7 @@ class ApplicationData_IPAForceCheck extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_IPAForceCheck clone() =>
+  ApplicationData_IPAForceCheck clone() => deepCopy();
-      ApplicationData_IPAForceCheck()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_IPAForceCheck copyWith(
           void Function(ApplicationData_IPAForceCheck) updates) =>
@@ -2219,8 +2152,6 @@ class ApplicationData_IPAForceCheck extends $pb.GeneratedMessage {
       ApplicationData_IPAForceCheck._();
   @$core.override
   ApplicationData_IPAForceCheck createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_IPAForceCheck> createRepeated() =>
-      $pb.PbList<ApplicationData_IPAForceCheck>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_IPAForceCheck getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_IPAForceCheck>(create);
@@ -2247,8 +2178,7 @@ class ApplicationData_DeleteAccount extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_DeleteAccount clone() =>
+  ApplicationData_DeleteAccount clone() => deepCopy();
-      ApplicationData_DeleteAccount()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_DeleteAccount copyWith(
           void Function(ApplicationData_DeleteAccount) updates) =>
@@ -2264,8 +2194,6 @@ class ApplicationData_DeleteAccount extends $pb.GeneratedMessage {
       ApplicationData_DeleteAccount._();
   @$core.override
   ApplicationData_DeleteAccount createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_DeleteAccount> createRepeated() =>
-      $pb.PbList<ApplicationData_DeleteAccount>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_DeleteAccount getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_DeleteAccount>(create);
@@ -2300,8 +2228,7 @@ class ApplicationData_AddAdditionalUser extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_AddAdditionalUser clone() =>
+  ApplicationData_AddAdditionalUser clone() => deepCopy();
-      ApplicationData_AddAdditionalUser()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_AddAdditionalUser copyWith(
           void Function(ApplicationData_AddAdditionalUser) updates) =>
@@ -2317,8 +2244,6 @@ class ApplicationData_AddAdditionalUser extends $pb.GeneratedMessage {
       ApplicationData_AddAdditionalUser._();
   @$core.override
   ApplicationData_AddAdditionalUser createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_AddAdditionalUser> createRepeated() =>
-      $pb.PbList<ApplicationData_AddAdditionalUser>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_AddAdditionalUser getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_AddAdditionalUser>(
@@ -2595,7 +2520,7 @@ class ApplicationData extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData clone() => ApplicationData()..mergeFromMessage(this);
+  ApplicationData clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData copyWith(void Function(ApplicationData) updates) =>
       super.copyWith((message) => updates(message as ApplicationData))
@@ -2608,15 +2533,63 @@ class ApplicationData extends $pb.GeneratedMessage {
   static ApplicationData create() => ApplicationData._();
   @$core.override
   ApplicationData createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData> createRepeated() =>
-      $pb.PbList<ApplicationData>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData>(create);
   static ApplicationData? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(8)
+  @$pb.TagNumber(9)
+  @$pb.TagNumber(10)
+  @$pb.TagNumber(11)
+  @$pb.TagNumber(12)
+  @$pb.TagNumber(13)
+  @$pb.TagNumber(14)
+  @$pb.TagNumber(15)
+  @$pb.TagNumber(16)
+  @$pb.TagNumber(17)
+  @$pb.TagNumber(18)
+  @$pb.TagNumber(19)
+  @$pb.TagNumber(20)
+  @$pb.TagNumber(22)
+  @$pb.TagNumber(23)
+  @$pb.TagNumber(24)
+  @$pb.TagNumber(25)
+  @$pb.TagNumber(26)
+  @$pb.TagNumber(27)
+  @$pb.TagNumber(28)
+  @$pb.TagNumber(29)
   ApplicationData_ApplicationData whichApplicationData() =>
       _ApplicationData_ApplicationDataByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(8)
+  @$pb.TagNumber(9)
+  @$pb.TagNumber(10)
+  @$pb.TagNumber(11)
+  @$pb.TagNumber(12)
+  @$pb.TagNumber(13)
+  @$pb.TagNumber(14)
+  @$pb.TagNumber(15)
+  @$pb.TagNumber(16)
+  @$pb.TagNumber(17)
+  @$pb.TagNumber(18)
+  @$pb.TagNumber(19)
+  @$pb.TagNumber(20)
+  @$pb.TagNumber(22)
+  @$pb.TagNumber(23)
+  @$pb.TagNumber(24)
+  @$pb.TagNumber(25)
+  @$pb.TagNumber(26)
+  @$pb.TagNumber(27)
+  @$pb.TagNumber(28)
+  @$pb.TagNumber(29)
   void clearApplicationData() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -2951,7 +2924,7 @@ class Response_PreKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_PreKey clone() => Response_PreKey()..mergeFromMessage(this);
+  Response_PreKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_PreKey copyWith(void Function(Response_PreKey) updates) =>
       super.copyWith((message) => updates(message as Response_PreKey))
@@ -2964,8 +2937,6 @@ class Response_PreKey extends $pb.GeneratedMessage {
   static Response_PreKey create() => Response_PreKey._();
   @$core.override
   Response_PreKey createEmptyInstance() => create();
-  static $pb.PbList<Response_PreKey> createRepeated() =>
-      $pb.PbList<Response_PreKey>();
   @$core.pragma('dart2js:noInline')
   static Response_PreKey getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_PreKey>(create);
@@ -3013,13 +2984,12 @@ class Response_Prekeys extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'client_to_server'),
       createEmptyInstance: create)
-    ..pc<Response_PreKey>(
+    ..pPM<Response_PreKey>(1, _omitFieldNames ? '' : 'prekeys',
-        1, _omitFieldNames ? '' : 'prekeys', $pb.PbFieldType.PM,
         subBuilder: Response_PreKey.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Prekeys clone() => Response_Prekeys()..mergeFromMessage(this);
+  Response_Prekeys clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Prekeys copyWith(void Function(Response_Prekeys) updates) =>
       super.copyWith((message) => updates(message as Response_Prekeys))
@@ -3032,8 +3002,6 @@ class Response_Prekeys extends $pb.GeneratedMessage {
   static Response_Prekeys create() => Response_Prekeys._();
   @$core.override
   Response_Prekeys createEmptyInstance() => create();
-  static $pb.PbList<Response_Prekeys> createRepeated() =>
-      $pb.PbList<Response_Prekeys>();
   @$core.pragma('dart2js:noInline')
   static Response_Prekeys getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Prekeys>(create);
@@ -3082,7 +3050,7 @@ class Response_Ok extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Ok clone() => Response_Ok()..mergeFromMessage(this);
+  Response_Ok clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Ok copyWith(void Function(Response_Ok) updates) =>
       super.copyWith((message) => updates(message as Response_Ok))
@@ -3095,13 +3063,16 @@ class Response_Ok extends $pb.GeneratedMessage {
   static Response_Ok create() => Response_Ok._();
   @$core.override
   Response_Ok createEmptyInstance() => create();
-  static $pb.PbList<Response_Ok> createRepeated() => $pb.PbList<Response_Ok>();
   @$core.pragma('dart2js:noInline')
   static Response_Ok getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Ok>(create);
   static Response_Ok? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   Response_Ok_Ok whichOk() => _Response_Ok_OkByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   void clearOk() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -3161,14 +3132,12 @@ class Response extends $pb.GeneratedMessage {
     ..oo(0, [1, 2])
     ..aOM<Response_Ok>(1, _omitFieldNames ? '' : 'ok',
         subBuilder: Response_Ok.create)
-    ..e<$0.ErrorCode>(2, _omitFieldNames ? '' : 'error', $pb.PbFieldType.OE,
+    ..aE<$0.ErrorCode>(2, _omitFieldNames ? '' : 'error',
-        defaultOrMaker: $0.ErrorCode.Unknown,
-        valueOf: $0.ErrorCode.valueOf,
         enumValues: $0.ErrorCode.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response clone() => Response()..mergeFromMessage(this);
+  Response clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response copyWith(void Function(Response) updates) =>
       super.copyWith((message) => updates(message as Response)) as Response;
@@ -3180,14 +3149,17 @@ class Response extends $pb.GeneratedMessage {
   static Response create() => Response._();
   @$core.override
   Response createEmptyInstance() => create();
-  static $pb.PbList<Response> createRepeated() => $pb.PbList<Response>();
   @$core.pragma('dart2js:noInline')
   static Response getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Response>(create);
   static Response? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   Response_Response whichResponse() =>
       _Response_ResponseByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   void clearResponse() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)

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

@@ -8,4 +8,4 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -57,7 +57,7 @@ class ServerToClient extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ServerToClient clone() => ServerToClient()..mergeFromMessage(this);
+  ServerToClient clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ServerToClient copyWith(void Function(ServerToClient) updates) =>
       super.copyWith((message) => updates(message as ServerToClient))
@@ -70,14 +70,14 @@ class ServerToClient extends $pb.GeneratedMessage {
   static ServerToClient create() => ServerToClient._();
   @$core.override
   ServerToClient createEmptyInstance() => create();
-  static $pb.PbList<ServerToClient> createRepeated() =>
-      $pb.PbList<ServerToClient>();
   @$core.pragma('dart2js:noInline')
   static ServerToClient getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ServerToClient>(create);
   static ServerToClient? _defaultInstance;
 
+  @$pb.TagNumber(1)
   ServerToClient_V whichV() => _ServerToClient_VByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
   void clearV() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -151,16 +151,14 @@ class V0 extends $pb.GeneratedMessage {
         protoName: 'newMessage', subBuilder: NewMessage.create)
     ..aOB(4, _omitFieldNames ? '' : 'RequestNewPreKeys',
         protoName: 'RequestNewPreKeys')
-    ..e<$0.ErrorCode>(6, _omitFieldNames ? '' : 'error', $pb.PbFieldType.OE,
+    ..aE<$0.ErrorCode>(6, _omitFieldNames ? '' : 'error',
-        defaultOrMaker: $0.ErrorCode.Unknown,
-        valueOf: $0.ErrorCode.valueOf,
         enumValues: $0.ErrorCode.values)
     ..aOM<NewMessages>(7, _omitFieldNames ? '' : 'newMessages',
         protoName: 'newMessages', subBuilder: NewMessages.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  V0 clone() => V0()..mergeFromMessage(this);
+  V0 clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   V0 copyWith(void Function(V0) updates) =>
       super.copyWith((message) => updates(message as V0)) as V0;
@@ -172,13 +170,22 @@ class V0 extends $pb.GeneratedMessage {
   static V0 create() => V0._();
   @$core.override
   V0 createEmptyInstance() => create();
-  static $pb.PbList<V0> createRepeated() => $pb.PbList<V0>();
   @$core.pragma('dart2js:noInline')
   static V0 getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<V0>(create);
   static V0? _defaultInstance;
 
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
   V0_Kind whichKind() => _V0_KindByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
   void clearKind() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -273,7 +280,7 @@ class NewMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  NewMessage clone() => NewMessage()..mergeFromMessage(this);
+  NewMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   NewMessage copyWith(void Function(NewMessage) updates) =>
       super.copyWith((message) => updates(message as NewMessage)) as NewMessage;
@@ -285,7 +292,6 @@ class NewMessage extends $pb.GeneratedMessage {
   static NewMessage create() => NewMessage._();
   @$core.override
   NewMessage createEmptyInstance() => create();
-  static $pb.PbList<NewMessage> createRepeated() => $pb.PbList<NewMessage>();
   @$core.pragma('dart2js:noInline')
   static NewMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<NewMessage>(create);
@@ -333,13 +339,12 @@ class NewMessages extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
-    ..pc<NewMessage>(
+    ..pPM<NewMessage>(1, _omitFieldNames ? '' : 'newMessages',
-        1, _omitFieldNames ? '' : 'newMessages', $pb.PbFieldType.PM,
         protoName: 'newMessages', subBuilder: NewMessage.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  NewMessages clone() => NewMessages()..mergeFromMessage(this);
+  NewMessages clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   NewMessages copyWith(void Function(NewMessages) updates) =>
       super.copyWith((message) => updates(message as NewMessages))
@@ -352,7 +357,6 @@ class NewMessages extends $pb.GeneratedMessage {
   static NewMessages create() => NewMessages._();
   @$core.override
   NewMessages createEmptyInstance() => create();
-  static $pb.PbList<NewMessages> createRepeated() => $pb.PbList<NewMessages>();
   @$core.pragma('dart2js:noInline')
   static NewMessages getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<NewMessages>(create);
@@ -389,8 +393,7 @@ class Response_Authenticated extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Authenticated clone() =>
+  Response_Authenticated clone() => deepCopy();
-      Response_Authenticated()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Authenticated copyWith(
           void Function(Response_Authenticated) updates) =>
@@ -404,8 +407,6 @@ class Response_Authenticated extends $pb.GeneratedMessage {
   static Response_Authenticated create() => Response_Authenticated._();
   @$core.override
   Response_Authenticated createEmptyInstance() => create();
-  static $pb.PbList<Response_Authenticated> createRepeated() =>
-      $pb.PbList<Response_Authenticated>();
   @$core.pragma('dart2js:noInline')
   static Response_Authenticated getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Authenticated>(create);
@@ -478,7 +479,7 @@ class Response_Plan extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Plan clone() => Response_Plan()..mergeFromMessage(this);
+  Response_Plan clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Plan copyWith(void Function(Response_Plan) updates) =>
       super.copyWith((message) => updates(message as Response_Plan))
@@ -491,8 +492,6 @@ class Response_Plan extends $pb.GeneratedMessage {
   static Response_Plan create() => Response_Plan._();
   @$core.override
   Response_Plan createEmptyInstance() => create();
-  static $pb.PbList<Response_Plan> createRepeated() =>
-      $pb.PbList<Response_Plan>();
   @$core.pragma('dart2js:noInline')
   static Response_Plan getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Plan>(create);
@@ -604,12 +603,12 @@ class Response_Plans extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
-    ..pc<Response_Plan>(1, _omitFieldNames ? '' : 'plans', $pb.PbFieldType.PM,
+    ..pPM<Response_Plan>(1, _omitFieldNames ? '' : 'plans',
         subBuilder: Response_Plan.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Plans clone() => Response_Plans()..mergeFromMessage(this);
+  Response_Plans clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Plans copyWith(void Function(Response_Plans) updates) =>
       super.copyWith((message) => updates(message as Response_Plans))
@@ -622,8 +621,6 @@ class Response_Plans extends $pb.GeneratedMessage {
   static Response_Plans create() => Response_Plans._();
   @$core.override
   Response_Plans createEmptyInstance() => create();
-  static $pb.PbList<Response_Plans> createRepeated() =>
-      $pb.PbList<Response_Plans>();
   @$core.pragma('dart2js:noInline')
   static Response_Plans getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Plans>(create);
@@ -663,8 +660,7 @@ class Response_AddAccountsInvite extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_AddAccountsInvite clone() =>
+  Response_AddAccountsInvite clone() => deepCopy();
-      Response_AddAccountsInvite()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_AddAccountsInvite copyWith(
           void Function(Response_AddAccountsInvite) updates) =>
@@ -679,8 +675,6 @@ class Response_AddAccountsInvite extends $pb.GeneratedMessage {
   static Response_AddAccountsInvite create() => Response_AddAccountsInvite._();
   @$core.override
   Response_AddAccountsInvite createEmptyInstance() => create();
-  static $pb.PbList<Response_AddAccountsInvite> createRepeated() =>
-      $pb.PbList<Response_AddAccountsInvite>();
   @$core.pragma('dart2js:noInline')
   static Response_AddAccountsInvite getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_AddAccountsInvite>(create);
@@ -728,14 +722,12 @@ class Response_AddAccountsInvites extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
-    ..pc<Response_AddAccountsInvite>(
+    ..pPM<Response_AddAccountsInvite>(1, _omitFieldNames ? '' : 'invites',
-        1, _omitFieldNames ? '' : 'invites', $pb.PbFieldType.PM,
         subBuilder: Response_AddAccountsInvite.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_AddAccountsInvites clone() =>
+  Response_AddAccountsInvites clone() => deepCopy();
-      Response_AddAccountsInvites()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_AddAccountsInvites copyWith(
           void Function(Response_AddAccountsInvites) updates) =>
@@ -751,8 +743,6 @@ class Response_AddAccountsInvites extends $pb.GeneratedMessage {
       Response_AddAccountsInvites._();
   @$core.override
   Response_AddAccountsInvites createEmptyInstance() => create();
-  static $pb.PbList<Response_AddAccountsInvites> createRepeated() =>
-      $pb.PbList<Response_AddAccountsInvites>();
   @$core.pragma('dart2js:noInline')
   static Response_AddAccountsInvites getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_AddAccountsInvites>(create);
@@ -791,17 +781,13 @@ class Response_Transaction extends $pb.GeneratedMessage {
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'depositCents')
-    ..e<Response_TransactionTypes>(
+    ..aE<Response_TransactionTypes>(2, _omitFieldNames ? '' : 'transactionType',
-        2, _omitFieldNames ? '' : 'transactionType', $pb.PbFieldType.OE,
-        defaultOrMaker: Response_TransactionTypes.Refund,
-        valueOf: Response_TransactionTypes.valueOf,
         enumValues: Response_TransactionTypes.values)
     ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Transaction clone() =>
+  Response_Transaction clone() => deepCopy();
-      Response_Transaction()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Transaction copyWith(void Function(Response_Transaction) updates) =>
       super.copyWith((message) => updates(message as Response_Transaction))
@@ -814,8 +800,6 @@ class Response_Transaction extends $pb.GeneratedMessage {
   static Response_Transaction create() => Response_Transaction._();
   @$core.override
   Response_Transaction createEmptyInstance() => create();
-  static $pb.PbList<Response_Transaction> createRepeated() =>
-      $pb.PbList<Response_Transaction>();
   @$core.pragma('dart2js:noInline')
   static Response_Transaction getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Transaction>(create);
@@ -882,8 +866,7 @@ class Response_AdditionalAccount extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_AdditionalAccount clone() =>
+  Response_AdditionalAccount clone() => deepCopy();
-      Response_AdditionalAccount()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_AdditionalAccount copyWith(
           void Function(Response_AdditionalAccount) updates) =>
@@ -898,8 +881,6 @@ class Response_AdditionalAccount extends $pb.GeneratedMessage {
   static Response_AdditionalAccount create() => Response_AdditionalAccount._();
   @$core.override
   Response_AdditionalAccount createEmptyInstance() => create();
-  static $pb.PbList<Response_AdditionalAccount> createRepeated() =>
-      $pb.PbList<Response_AdditionalAccount>();
   @$core.pragma('dart2js:noInline')
   static Response_AdditionalAccount getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_AdditionalAccount>(create);
@@ -964,7 +945,7 @@ class Response_Voucher extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Voucher clone() => Response_Voucher()..mergeFromMessage(this);
+  Response_Voucher clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Voucher copyWith(void Function(Response_Voucher) updates) =>
       super.copyWith((message) => updates(message as Response_Voucher))
@@ -977,8 +958,6 @@ class Response_Voucher extends $pb.GeneratedMessage {
   static Response_Voucher create() => Response_Voucher._();
   @$core.override
   Response_Voucher createEmptyInstance() => create();
-  static $pb.PbList<Response_Voucher> createRepeated() =>
-      $pb.PbList<Response_Voucher>();
   @$core.pragma('dart2js:noInline')
   static Response_Voucher getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Voucher>(create);
@@ -1053,13 +1032,12 @@ class Response_Vouchers extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
-    ..pc<Response_Voucher>(
+    ..pPM<Response_Voucher>(1, _omitFieldNames ? '' : 'vouchers',
-        1, _omitFieldNames ? '' : 'vouchers', $pb.PbFieldType.PM,
         subBuilder: Response_Voucher.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Vouchers clone() => Response_Vouchers()..mergeFromMessage(this);
+  Response_Vouchers clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Vouchers copyWith(void Function(Response_Vouchers) updates) =>
       super.copyWith((message) => updates(message as Response_Vouchers))
@@ -1072,8 +1050,6 @@ class Response_Vouchers extends $pb.GeneratedMessage {
   static Response_Vouchers create() => Response_Vouchers._();
   @$core.override
   Response_Vouchers createEmptyInstance() => create();
-  static $pb.PbList<Response_Vouchers> createRepeated() =>
-      $pb.PbList<Response_Vouchers>();
   @$core.pragma('dart2js:noInline')
   static Response_Vouchers getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Vouchers>(create);
@@ -1129,19 +1105,17 @@ class Response_PlanBallance extends $pb.GeneratedMessage {
     ..aInt64(2, _omitFieldNames ? '' : 'usedUploadMediaSizeLimit')
     ..aInt64(3, _omitFieldNames ? '' : 'paymentPeriodDays')
     ..aInt64(4, _omitFieldNames ? '' : 'lastPaymentDoneUnixTimestamp')
-    ..pc<Response_Transaction>(
+    ..pPM<Response_Transaction>(5, _omitFieldNames ? '' : 'transactions',
-        5, _omitFieldNames ? '' : 'transactions', $pb.PbFieldType.PM,
         subBuilder: Response_Transaction.create)
-    ..pc<Response_AdditionalAccount>(
+    ..pPM<Response_AdditionalAccount>(
-        6, _omitFieldNames ? '' : 'additionalAccounts', $pb.PbFieldType.PM,
+        6, _omitFieldNames ? '' : 'additionalAccounts',
         subBuilder: Response_AdditionalAccount.create)
     ..aOB(7, _omitFieldNames ? '' : 'autoRenewal')
     ..aInt64(8, _omitFieldNames ? '' : 'additionalAccountOwnerId')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_PlanBallance clone() =>
+  Response_PlanBallance clone() => deepCopy();
-      Response_PlanBallance()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_PlanBallance copyWith(
           void Function(Response_PlanBallance) updates) =>
@@ -1155,8 +1129,6 @@ class Response_PlanBallance extends $pb.GeneratedMessage {
   static Response_PlanBallance create() => Response_PlanBallance._();
   @$core.override
   Response_PlanBallance createEmptyInstance() => create();
-  static $pb.PbList<Response_PlanBallance> createRepeated() =>
-      $pb.PbList<Response_PlanBallance>();
   @$core.pragma('dart2js:noInline')
   static Response_PlanBallance getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_PlanBallance>(create);
@@ -1256,7 +1228,7 @@ class Response_Location extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Location clone() => Response_Location()..mergeFromMessage(this);
+  Response_Location clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Location copyWith(void Function(Response_Location) updates) =>
       super.copyWith((message) => updates(message as Response_Location))
@@ -1269,8 +1241,6 @@ class Response_Location extends $pb.GeneratedMessage {
   static Response_Location create() => Response_Location._();
   @$core.override
   Response_Location createEmptyInstance() => create();
-  static $pb.PbList<Response_Location> createRepeated() =>
-      $pb.PbList<Response_Location>();
   @$core.pragma('dart2js:noInline')
   static Response_Location getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Location>(create);
@@ -1335,7 +1305,7 @@ class Response_PreKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_PreKey clone() => Response_PreKey()..mergeFromMessage(this);
+  Response_PreKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_PreKey copyWith(void Function(Response_PreKey) updates) =>
       super.copyWith((message) => updates(message as Response_PreKey))
@@ -1348,8 +1318,6 @@ class Response_PreKey extends $pb.GeneratedMessage {
   static Response_PreKey create() => Response_PreKey._();
   @$core.override
   Response_PreKey createEmptyInstance() => create();
-  static $pb.PbList<Response_PreKey> createRepeated() =>
-      $pb.PbList<Response_PreKey>();
   @$core.pragma('dart2js:noInline')
   static Response_PreKey getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_PreKey>(create);
@@ -1410,8 +1378,7 @@ class Response_SignedPreKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_SignedPreKey clone() =>
+  Response_SignedPreKey clone() => deepCopy();
-      Response_SignedPreKey()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_SignedPreKey copyWith(
           void Function(Response_SignedPreKey) updates) =>
@@ -1425,8 +1392,6 @@ class Response_SignedPreKey extends $pb.GeneratedMessage {
   static Response_SignedPreKey create() => Response_SignedPreKey._();
   @$core.override
   Response_SignedPreKey createEmptyInstance() => create();
-  static $pb.PbList<Response_SignedPreKey> createRepeated() =>
-      $pb.PbList<Response_SignedPreKey>();
   @$core.pragma('dart2js:noInline')
   static Response_SignedPreKey getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_SignedPreKey>(create);
@@ -1500,8 +1465,7 @@ class Response_UserData extends $pb.GeneratedMessage {
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'userId')
-    ..pc<Response_PreKey>(
+    ..pPM<Response_PreKey>(2, _omitFieldNames ? '' : 'prekeys',
-        2, _omitFieldNames ? '' : 'prekeys', $pb.PbFieldType.PM,
         subBuilder: Response_PreKey.create)
     ..a<$core.List<$core.int>>(
         3, _omitFieldNames ? '' : 'publicIdentityKey', $pb.PbFieldType.OY)
@@ -1516,7 +1480,7 @@ class Response_UserData extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_UserData clone() => Response_UserData()..mergeFromMessage(this);
+  Response_UserData clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_UserData copyWith(void Function(Response_UserData) updates) =>
       super.copyWith((message) => updates(message as Response_UserData))
@@ -1529,8 +1493,6 @@ class Response_UserData extends $pb.GeneratedMessage {
   static Response_UserData create() => Response_UserData._();
   @$core.override
   Response_UserData createEmptyInstance() => create();
-  static $pb.PbList<Response_UserData> createRepeated() =>
-      $pb.PbList<Response_UserData>();
   @$core.pragma('dart2js:noInline')
   static Response_UserData getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_UserData>(create);
@@ -1636,8 +1598,7 @@ class Response_UploadToken extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_UploadToken clone() =>
+  Response_UploadToken clone() => deepCopy();
-      Response_UploadToken()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_UploadToken copyWith(void Function(Response_UploadToken) updates) =>
       super.copyWith((message) => updates(message as Response_UploadToken))
@@ -1650,8 +1611,6 @@ class Response_UploadToken extends $pb.GeneratedMessage {
   static Response_UploadToken create() => Response_UploadToken._();
   @$core.override
   Response_UploadToken createEmptyInstance() => create();
-  static $pb.PbList<Response_UploadToken> createRepeated() =>
-      $pb.PbList<Response_UploadToken>();
   @$core.pragma('dart2js:noInline')
   static Response_UploadToken getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_UploadToken>(create);
@@ -1698,8 +1657,7 @@ class Response_DownloadTokens extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_DownloadTokens clone() =>
+  Response_DownloadTokens clone() => deepCopy();
-      Response_DownloadTokens()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_DownloadTokens copyWith(
           void Function(Response_DownloadTokens) updates) =>
@@ -1713,8 +1671,6 @@ class Response_DownloadTokens extends $pb.GeneratedMessage {
   static Response_DownloadTokens create() => Response_DownloadTokens._();
   @$core.override
   Response_DownloadTokens createEmptyInstance() => create();
-  static $pb.PbList<Response_DownloadTokens> createRepeated() =>
-      $pb.PbList<Response_DownloadTokens>();
   @$core.pragma('dart2js:noInline')
   static Response_DownloadTokens getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_DownloadTokens>(create);
@@ -1754,8 +1710,7 @@ class Response_ProofOfWork extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_ProofOfWork clone() =>
+  Response_ProofOfWork clone() => deepCopy();
-      Response_ProofOfWork()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_ProofOfWork copyWith(void Function(Response_ProofOfWork) updates) =>
       super.copyWith((message) => updates(message as Response_ProofOfWork))
@@ -1768,8 +1723,6 @@ class Response_ProofOfWork extends $pb.GeneratedMessage {
   static Response_ProofOfWork create() => Response_ProofOfWork._();
   @$core.override
   Response_ProofOfWork createEmptyInstance() => create();
-  static $pb.PbList<Response_ProofOfWork> createRepeated() =>
-      $pb.PbList<Response_ProofOfWork>();
   @$core.pragma('dart2js:noInline')
   static Response_ProofOfWork getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_ProofOfWork>(create);
@@ -1916,7 +1869,7 @@ class Response_Ok extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Ok clone() => Response_Ok()..mergeFromMessage(this);
+  Response_Ok clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Ok copyWith(void Function(Response_Ok) updates) =>
       super.copyWith((message) => updates(message as Response_Ok))
@@ -1929,13 +1882,42 @@ class Response_Ok extends $pb.GeneratedMessage {
   static Response_Ok create() => Response_Ok._();
   @$core.override
   Response_Ok createEmptyInstance() => create();
-  static $pb.PbList<Response_Ok> createRepeated() => $pb.PbList<Response_Ok>();
   @$core.pragma('dart2js:noInline')
   static Response_Ok getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Ok>(create);
   static Response_Ok? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
+  @$pb.TagNumber(8)
+  @$pb.TagNumber(9)
+  @$pb.TagNumber(10)
+  @$pb.TagNumber(11)
+  @$pb.TagNumber(12)
+  @$pb.TagNumber(13)
+  @$pb.TagNumber(14)
+  @$pb.TagNumber(15)
   Response_Ok_Ok whichOk() => _Response_Ok_OkByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
+  @$pb.TagNumber(8)
+  @$pb.TagNumber(9)
+  @$pb.TagNumber(10)
+  @$pb.TagNumber(11)
+  @$pb.TagNumber(12)
+  @$pb.TagNumber(13)
+  @$pb.TagNumber(14)
+  @$pb.TagNumber(15)
   void clearOk() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -2133,14 +2115,12 @@ class Response extends $pb.GeneratedMessage {
     ..oo(0, [1, 2])
     ..aOM<Response_Ok>(1, _omitFieldNames ? '' : 'ok',
         subBuilder: Response_Ok.create)
-    ..e<$0.ErrorCode>(2, _omitFieldNames ? '' : 'error', $pb.PbFieldType.OE,
+    ..aE<$0.ErrorCode>(2, _omitFieldNames ? '' : 'error',
-        defaultOrMaker: $0.ErrorCode.Unknown,
-        valueOf: $0.ErrorCode.valueOf,
         enumValues: $0.ErrorCode.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response clone() => Response()..mergeFromMessage(this);
+  Response clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response copyWith(void Function(Response) updates) =>
       super.copyWith((message) => updates(message as Response)) as Response;
@@ -2152,14 +2132,17 @@ class Response extends $pb.GeneratedMessage {
   static Response create() => Response._();
   @$core.override
   Response createEmptyInstance() => create();
-  static $pb.PbList<Response> createRepeated() => $pb.PbList<Response>();
   @$core.pragma('dart2js:noInline')
   static Response getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Response>(create);
   static Response? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   Response_Response whichResponse() =>
       _Response_ResponseByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   void clearResponse() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -45,8 +45,7 @@ class TwonlySafeBackupContent extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  TwonlySafeBackupContent clone() =>
+  TwonlySafeBackupContent clone() => deepCopy();
-      TwonlySafeBackupContent()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   TwonlySafeBackupContent copyWith(
           void Function(TwonlySafeBackupContent) updates) =>
@@ -60,8 +59,6 @@ class TwonlySafeBackupContent extends $pb.GeneratedMessage {
   static TwonlySafeBackupContent create() => TwonlySafeBackupContent._();
   @$core.override
   TwonlySafeBackupContent createEmptyInstance() => create();
-  static $pb.PbList<TwonlySafeBackupContent> createRepeated() =>
-      $pb.PbList<TwonlySafeBackupContent>();
   @$core.pragma('dart2js:noInline')
   static TwonlySafeBackupContent getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupContent>(create);
@@ -120,8 +117,7 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  TwonlySafeBackupEncrypted clone() =>
+  TwonlySafeBackupEncrypted clone() => deepCopy();
-      TwonlySafeBackupEncrypted()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   TwonlySafeBackupEncrypted copyWith(
           void Function(TwonlySafeBackupEncrypted) updates) =>
@@ -135,8 +131,6 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
   static TwonlySafeBackupEncrypted create() => TwonlySafeBackupEncrypted._();
   @$core.override
   TwonlySafeBackupEncrypted createEmptyInstance() => create();
-  static $pb.PbList<TwonlySafeBackupEncrypted> createRepeated() =>
-      $pb.PbList<TwonlySafeBackupEncrypted>();
   @$core.pragma('dart2js:noInline')
   static TwonlySafeBackupEncrypted getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupEncrypted>(create);

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

@@ -8,4 +8,4 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -53,7 +53,7 @@ class SharedContact extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SharedContact clone() => SharedContact()..mergeFromMessage(this);
+  SharedContact clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   SharedContact copyWith(void Function(SharedContact) updates) =>
       super.copyWith((message) => updates(message as SharedContact))
@@ -66,8 +66,6 @@ class SharedContact extends $pb.GeneratedMessage {
   static SharedContact create() => SharedContact._();
   @$core.override
   SharedContact createEmptyInstance() => create();
-  static $pb.PbList<SharedContact> createRepeated() =>
-      $pb.PbList<SharedContact>();
   @$core.pragma('dart2js:noInline')
   static SharedContact getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<SharedContact>(create);
@@ -129,21 +127,16 @@ class AdditionalMessageData extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'AdditionalMessageData',
       createEmptyInstance: create)
-    ..e<AdditionalMessageData_Type>(
+    ..aE<AdditionalMessageData_Type>(1, _omitFieldNames ? '' : 'type',
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: AdditionalMessageData_Type.LINK,
-        valueOf: AdditionalMessageData_Type.valueOf,
         enumValues: AdditionalMessageData_Type.values)
     ..aOS(2, _omitFieldNames ? '' : 'link')
-    ..pc<SharedContact>(
+    ..pPM<SharedContact>(3, _omitFieldNames ? '' : 'contacts',
-        3, _omitFieldNames ? '' : 'contacts', $pb.PbFieldType.PM,
         subBuilder: SharedContact.create)
     ..aInt64(4, _omitFieldNames ? '' : 'restoredFlameCounter')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AdditionalMessageData clone() =>
+  AdditionalMessageData clone() => deepCopy();
-      AdditionalMessageData()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   AdditionalMessageData copyWith(
           void Function(AdditionalMessageData) updates) =>
@@ -157,8 +150,6 @@ class AdditionalMessageData extends $pb.GeneratedMessage {
   static AdditionalMessageData create() => AdditionalMessageData._();
   @$core.override
   AdditionalMessageData createEmptyInstance() => create();
-  static $pb.PbList<AdditionalMessageData> createRepeated() =>
-      $pb.PbList<AdditionalMessageData>();
   @$core.pragma('dart2js:noInline')
   static AdditionalMessageData getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<AdditionalMessageData>(create);

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -62,7 +62,7 @@ class EncryptedGroupState extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedGroupState clone() => EncryptedGroupState()..mergeFromMessage(this);
+  EncryptedGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedGroupState copyWith(void Function(EncryptedGroupState) updates) =>
       super.copyWith((message) => updates(message as EncryptedGroupState))
@@ -75,8 +75,6 @@ class EncryptedGroupState extends $pb.GeneratedMessage {
   static EncryptedGroupState create() => EncryptedGroupState._();
   @$core.override
   EncryptedGroupState createEmptyInstance() => create();
-  static $pb.PbList<EncryptedGroupState> createRepeated() =>
-      $pb.PbList<EncryptedGroupState>();
   @$core.pragma('dart2js:noInline')
   static EncryptedGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedGroupState>(create);
@@ -138,16 +136,12 @@ class EncryptedAppendedGroupState extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedAppendedGroupState',
       createEmptyInstance: create)
-    ..e<EncryptedAppendedGroupState_Type>(
+    ..aE<EncryptedAppendedGroupState_Type>(1, _omitFieldNames ? '' : 'type',
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedAppendedGroupState_Type.LEFT_GROUP,
-        valueOf: EncryptedAppendedGroupState_Type.valueOf,
         enumValues: EncryptedAppendedGroupState_Type.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedAppendedGroupState clone() =>
+  EncryptedAppendedGroupState clone() => deepCopy();
-      EncryptedAppendedGroupState()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedAppendedGroupState copyWith(
           void Function(EncryptedAppendedGroupState) updates) =>
@@ -163,8 +157,6 @@ class EncryptedAppendedGroupState extends $pb.GeneratedMessage {
       EncryptedAppendedGroupState._();
   @$core.override
   EncryptedAppendedGroupState createEmptyInstance() => create();
-  static $pb.PbList<EncryptedAppendedGroupState> createRepeated() =>
-      $pb.PbList<EncryptedAppendedGroupState>();
   @$core.pragma('dart2js:noInline')
   static EncryptedAppendedGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedAppendedGroupState>(create);
@@ -215,8 +207,7 @@ class EncryptedGroupStateEnvelop extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedGroupStateEnvelop clone() =>
+  EncryptedGroupStateEnvelop clone() => deepCopy();
-      EncryptedGroupStateEnvelop()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedGroupStateEnvelop copyWith(
           void Function(EncryptedGroupStateEnvelop) updates) =>
@@ -231,8 +222,6 @@ class EncryptedGroupStateEnvelop extends $pb.GeneratedMessage {
   static EncryptedGroupStateEnvelop create() => EncryptedGroupStateEnvelop._();
   @$core.override
   EncryptedGroupStateEnvelop createEmptyInstance() => create();
-  static $pb.PbList<EncryptedGroupStateEnvelop> createRepeated() =>
-      $pb.PbList<EncryptedGroupStateEnvelop>();
   @$core.pragma('dart2js:noInline')
   static EncryptedGroupStateEnvelop getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedGroupStateEnvelop>(create);

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -48,9 +48,7 @@ class Message extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'Message',
       createEmptyInstance: create)
-    ..e<Message_Type>(1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
+    ..aE<Message_Type>(1, _omitFieldNames ? '' : 'type',
-        defaultOrMaker: Message_Type.SENDER_DELIVERY_RECEIPT,
-        valueOf: Message_Type.valueOf,
         enumValues: Message_Type.values)
     ..aOS(2, _omitFieldNames ? '' : 'receiptId')
     ..a<$core.List<$core.int>>(
@@ -60,7 +58,7 @@ class Message extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Message clone() => Message()..mergeFromMessage(this);
+  Message clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Message copyWith(void Function(Message) updates) =>
       super.copyWith((message) => updates(message as Message)) as Message;
@@ -72,7 +70,6 @@ class Message extends $pb.GeneratedMessage {
   static Message create() => Message._();
   @$core.override
   Message createEmptyInstance() => create();
-  static $pb.PbList<Message> createRepeated() => $pb.PbList<Message>();
   @$core.pragma('dart2js:noInline')
   static Message getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Message>(create);
@@ -136,8 +133,7 @@ class PlaintextContent_RetryErrorMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PlaintextContent_RetryErrorMessage clone() =>
+  PlaintextContent_RetryErrorMessage clone() => deepCopy();
-      PlaintextContent_RetryErrorMessage()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PlaintextContent_RetryErrorMessage copyWith(
           void Function(PlaintextContent_RetryErrorMessage) updates) =>
@@ -153,8 +149,6 @@ class PlaintextContent_RetryErrorMessage extends $pb.GeneratedMessage {
       PlaintextContent_RetryErrorMessage._();
   @$core.override
   PlaintextContent_RetryErrorMessage createEmptyInstance() => create();
-  static $pb.PbList<PlaintextContent_RetryErrorMessage> createRepeated() =>
-      $pb.PbList<PlaintextContent_RetryErrorMessage>();
   @$core.pragma('dart2js:noInline')
   static PlaintextContent_RetryErrorMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<PlaintextContent_RetryErrorMessage>(
@@ -184,16 +178,13 @@ class PlaintextContent_DecryptionErrorMessage extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'PlaintextContent.DecryptionErrorMessage',
       createEmptyInstance: create)
-    ..e<PlaintextContent_DecryptionErrorMessage_Type>(
+    ..aE<PlaintextContent_DecryptionErrorMessage_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
+        1, _omitFieldNames ? '' : 'type',
-        defaultOrMaker: PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN,
-        valueOf: PlaintextContent_DecryptionErrorMessage_Type.valueOf,
         enumValues: PlaintextContent_DecryptionErrorMessage_Type.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PlaintextContent_DecryptionErrorMessage clone() =>
+  PlaintextContent_DecryptionErrorMessage clone() => deepCopy();
-      PlaintextContent_DecryptionErrorMessage()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PlaintextContent_DecryptionErrorMessage copyWith(
           void Function(PlaintextContent_DecryptionErrorMessage) updates) =>
@@ -209,8 +200,6 @@ class PlaintextContent_DecryptionErrorMessage extends $pb.GeneratedMessage {
       PlaintextContent_DecryptionErrorMessage._();
   @$core.override
   PlaintextContent_DecryptionErrorMessage createEmptyInstance() => create();
-  static $pb.PbList<PlaintextContent_DecryptionErrorMessage> createRepeated() =>
-      $pb.PbList<PlaintextContent_DecryptionErrorMessage>();
   @$core.pragma('dart2js:noInline')
   static PlaintextContent_DecryptionErrorMessage getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -261,7 +250,7 @@ class PlaintextContent extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PlaintextContent clone() => PlaintextContent()..mergeFromMessage(this);
+  PlaintextContent clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PlaintextContent copyWith(void Function(PlaintextContent) updates) =>
       super.copyWith((message) => updates(message as PlaintextContent))
@@ -274,8 +263,6 @@ class PlaintextContent extends $pb.GeneratedMessage {
   static PlaintextContent create() => PlaintextContent._();
   @$core.override
   PlaintextContent createEmptyInstance() => create();
-  static $pb.PbList<PlaintextContent> createRepeated() =>
-      $pb.PbList<PlaintextContent>();
   @$core.pragma('dart2js:noInline')
   static PlaintextContent getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<PlaintextContent>(create);
@@ -331,18 +318,13 @@ class EncryptedContent_ErrorMessages extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.ErrorMessages',
       createEmptyInstance: create)
-    ..e<EncryptedContent_ErrorMessages_Type>(
+    ..aE<EncryptedContent_ErrorMessages_Type>(1, _omitFieldNames ? '' : 'type',
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_ErrorMessages_Type
-            .ERROR_PROCESSING_MESSAGE_CREATED_ACCOUNT_REQUEST_INSTEAD,
-        valueOf: EncryptedContent_ErrorMessages_Type.valueOf,
         enumValues: EncryptedContent_ErrorMessages_Type.values)
     ..aOS(2, _omitFieldNames ? '' : 'relatedReceiptId')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_ErrorMessages clone() =>
+  EncryptedContent_ErrorMessages clone() => deepCopy();
-      EncryptedContent_ErrorMessages()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_ErrorMessages copyWith(
           void Function(EncryptedContent_ErrorMessages) updates) =>
@@ -358,8 +340,6 @@ class EncryptedContent_ErrorMessages extends $pb.GeneratedMessage {
       EncryptedContent_ErrorMessages._();
   @$core.override
   EncryptedContent_ErrorMessages createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_ErrorMessages> createRepeated() =>
-      $pb.PbList<EncryptedContent_ErrorMessages>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_ErrorMessages getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_ErrorMessages>(create);
@@ -414,8 +394,7 @@ class EncryptedContent_GroupCreate extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_GroupCreate clone() =>
+  EncryptedContent_GroupCreate clone() => deepCopy();
-      EncryptedContent_GroupCreate()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_GroupCreate copyWith(
           void Function(EncryptedContent_GroupCreate) updates) =>
@@ -431,8 +410,6 @@ class EncryptedContent_GroupCreate extends $pb.GeneratedMessage {
       EncryptedContent_GroupCreate._();
   @$core.override
   EncryptedContent_GroupCreate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_GroupCreate> createRepeated() =>
-      $pb.PbList<EncryptedContent_GroupCreate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_GroupCreate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_GroupCreate>(create);
@@ -484,8 +461,7 @@ class EncryptedContent_GroupJoin extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_GroupJoin clone() =>
+  EncryptedContent_GroupJoin clone() => deepCopy();
-      EncryptedContent_GroupJoin()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_GroupJoin copyWith(
           void Function(EncryptedContent_GroupJoin) updates) =>
@@ -500,8 +476,6 @@ class EncryptedContent_GroupJoin extends $pb.GeneratedMessage {
   static EncryptedContent_GroupJoin create() => EncryptedContent_GroupJoin._();
   @$core.override
   EncryptedContent_GroupJoin createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_GroupJoin> createRepeated() =>
-      $pb.PbList<EncryptedContent_GroupJoin>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_GroupJoin getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_GroupJoin>(create);
@@ -537,8 +511,7 @@ class EncryptedContent_ResendGroupPublicKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_ResendGroupPublicKey clone() =>
+  EncryptedContent_ResendGroupPublicKey clone() => deepCopy();
-      EncryptedContent_ResendGroupPublicKey()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_ResendGroupPublicKey copyWith(
           void Function(EncryptedContent_ResendGroupPublicKey) updates) =>
@@ -554,8 +527,6 @@ class EncryptedContent_ResendGroupPublicKey extends $pb.GeneratedMessage {
       EncryptedContent_ResendGroupPublicKey._();
   @$core.override
   EncryptedContent_ResendGroupPublicKey createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_ResendGroupPublicKey> createRepeated() =>
-      $pb.PbList<EncryptedContent_ResendGroupPublicKey>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_ResendGroupPublicKey getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -599,8 +570,7 @@ class EncryptedContent_GroupUpdate extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_GroupUpdate clone() =>
+  EncryptedContent_GroupUpdate clone() => deepCopy();
-      EncryptedContent_GroupUpdate()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_GroupUpdate copyWith(
           void Function(EncryptedContent_GroupUpdate) updates) =>
@@ -616,8 +586,6 @@ class EncryptedContent_GroupUpdate extends $pb.GeneratedMessage {
       EncryptedContent_GroupUpdate._();
   @$core.override
   EncryptedContent_GroupUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_GroupUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_GroupUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_GroupUpdate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_GroupUpdate>(create);
@@ -695,8 +663,7 @@ class EncryptedContent_TextMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_TextMessage clone() =>
+  EncryptedContent_TextMessage clone() => deepCopy();
-      EncryptedContent_TextMessage()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_TextMessage copyWith(
           void Function(EncryptedContent_TextMessage) updates) =>
@@ -712,8 +679,6 @@ class EncryptedContent_TextMessage extends $pb.GeneratedMessage {
       EncryptedContent_TextMessage._();
   @$core.override
   EncryptedContent_TextMessage createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_TextMessage> createRepeated() =>
-      $pb.PbList<EncryptedContent_TextMessage>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_TextMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_TextMessage>(create);
@@ -793,8 +758,7 @@ class EncryptedContent_AdditionalDataMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_AdditionalDataMessage clone() =>
+  EncryptedContent_AdditionalDataMessage clone() => deepCopy();
-      EncryptedContent_AdditionalDataMessage()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_AdditionalDataMessage copyWith(
           void Function(EncryptedContent_AdditionalDataMessage) updates) =>
@@ -810,8 +774,6 @@ class EncryptedContent_AdditionalDataMessage extends $pb.GeneratedMessage {
       EncryptedContent_AdditionalDataMessage._();
   @$core.override
   EncryptedContent_AdditionalDataMessage createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_AdditionalDataMessage> createRepeated() =>
-      $pb.PbList<EncryptedContent_AdditionalDataMessage>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_AdditionalDataMessage getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -887,8 +849,7 @@ class EncryptedContent_Reaction extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_Reaction clone() =>
+  EncryptedContent_Reaction clone() => deepCopy();
-      EncryptedContent_Reaction()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_Reaction copyWith(
           void Function(EncryptedContent_Reaction) updates) =>
@@ -902,8 +863,6 @@ class EncryptedContent_Reaction extends $pb.GeneratedMessage {
   static EncryptedContent_Reaction create() => EncryptedContent_Reaction._();
   @$core.override
   EncryptedContent_Reaction createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_Reaction> createRepeated() =>
-      $pb.PbList<EncryptedContent_Reaction>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_Reaction getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_Reaction>(create);
@@ -967,10 +926,7 @@ class EncryptedContent_MessageUpdate extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.MessageUpdate',
       createEmptyInstance: create)
-    ..e<EncryptedContent_MessageUpdate_Type>(
+    ..aE<EncryptedContent_MessageUpdate_Type>(1, _omitFieldNames ? '' : 'type',
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_MessageUpdate_Type.DELETE,
-        valueOf: EncryptedContent_MessageUpdate_Type.valueOf,
         enumValues: EncryptedContent_MessageUpdate_Type.values)
     ..aOS(2, _omitFieldNames ? '' : 'senderMessageId')
     ..pPS(3, _omitFieldNames ? '' : 'multipleTargetMessageIds')
@@ -979,8 +935,7 @@ class EncryptedContent_MessageUpdate extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_MessageUpdate clone() =>
+  EncryptedContent_MessageUpdate clone() => deepCopy();
-      EncryptedContent_MessageUpdate()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_MessageUpdate copyWith(
           void Function(EncryptedContent_MessageUpdate) updates) =>
@@ -996,8 +951,6 @@ class EncryptedContent_MessageUpdate extends $pb.GeneratedMessage {
       EncryptedContent_MessageUpdate._();
   @$core.override
   EncryptedContent_MessageUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_MessageUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_MessageUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_MessageUpdate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_MessageUpdate>(create);
@@ -1088,10 +1041,7 @@ class EncryptedContent_Media extends $pb.GeneratedMessage {
       _omitMessageNames ? '' : 'EncryptedContent.Media',
       createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'senderMessageId')
-    ..e<EncryptedContent_Media_Type>(
+    ..aE<EncryptedContent_Media_Type>(2, _omitFieldNames ? '' : 'type',
-        2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_Media_Type.REUPLOAD,
-        valueOf: EncryptedContent_Media_Type.valueOf,
         enumValues: EncryptedContent_Media_Type.values)
     ..aInt64(3, _omitFieldNames ? '' : 'displayLimitInMilliseconds')
     ..aOB(4, _omitFieldNames ? '' : 'requiresAuthentication')
@@ -1110,8 +1060,7 @@ class EncryptedContent_Media extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_Media clone() =>
+  EncryptedContent_Media clone() => deepCopy();
-      EncryptedContent_Media()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_Media copyWith(
           void Function(EncryptedContent_Media) updates) =>
@@ -1125,8 +1074,6 @@ class EncryptedContent_Media extends $pb.GeneratedMessage {
   static EncryptedContent_Media create() => EncryptedContent_Media._();
   @$core.override
   EncryptedContent_Media createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_Media> createRepeated() =>
-      $pb.PbList<EncryptedContent_Media>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_Media getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_Media>(create);
@@ -1256,17 +1203,13 @@ class EncryptedContent_MediaUpdate extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.MediaUpdate',
       createEmptyInstance: create)
-    ..e<EncryptedContent_MediaUpdate_Type>(
+    ..aE<EncryptedContent_MediaUpdate_Type>(1, _omitFieldNames ? '' : 'type',
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_MediaUpdate_Type.REOPENED,
-        valueOf: EncryptedContent_MediaUpdate_Type.valueOf,
         enumValues: EncryptedContent_MediaUpdate_Type.values)
     ..aOS(2, _omitFieldNames ? '' : 'targetMessageId')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_MediaUpdate clone() =>
+  EncryptedContent_MediaUpdate clone() => deepCopy();
-      EncryptedContent_MediaUpdate()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_MediaUpdate copyWith(
           void Function(EncryptedContent_MediaUpdate) updates) =>
@@ -1282,8 +1225,6 @@ class EncryptedContent_MediaUpdate extends $pb.GeneratedMessage {
       EncryptedContent_MediaUpdate._();
   @$core.override
   EncryptedContent_MediaUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_MediaUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_MediaUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_MediaUpdate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_MediaUpdate>(create);
@@ -1329,16 +1270,12 @@ class EncryptedContent_ContactRequest extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.ContactRequest',
       createEmptyInstance: create)
-    ..e<EncryptedContent_ContactRequest_Type>(
+    ..aE<EncryptedContent_ContactRequest_Type>(1, _omitFieldNames ? '' : 'type',
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_ContactRequest_Type.REQUEST,
-        valueOf: EncryptedContent_ContactRequest_Type.valueOf,
         enumValues: EncryptedContent_ContactRequest_Type.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_ContactRequest clone() =>
+  EncryptedContent_ContactRequest clone() => deepCopy();
-      EncryptedContent_ContactRequest()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_ContactRequest copyWith(
           void Function(EncryptedContent_ContactRequest) updates) =>
@@ -1354,8 +1291,6 @@ class EncryptedContent_ContactRequest extends $pb.GeneratedMessage {
       EncryptedContent_ContactRequest._();
   @$core.override
   EncryptedContent_ContactRequest createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_ContactRequest> createRepeated() =>
-      $pb.PbList<EncryptedContent_ContactRequest>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_ContactRequest getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_ContactRequest>(
@@ -1400,10 +1335,7 @@ class EncryptedContent_ContactUpdate extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.ContactUpdate',
       createEmptyInstance: create)
-    ..e<EncryptedContent_ContactUpdate_Type>(
+    ..aE<EncryptedContent_ContactUpdate_Type>(1, _omitFieldNames ? '' : 'type',
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_ContactUpdate_Type.REQUEST,
-        valueOf: EncryptedContent_ContactUpdate_Type.valueOf,
         enumValues: EncryptedContent_ContactUpdate_Type.values)
     ..a<$core.List<$core.int>>(
         2, _omitFieldNames ? '' : 'avatarSvgCompressed', $pb.PbFieldType.OY)
@@ -1412,8 +1344,7 @@ class EncryptedContent_ContactUpdate extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_ContactUpdate clone() =>
+  EncryptedContent_ContactUpdate clone() => deepCopy();
-      EncryptedContent_ContactUpdate()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_ContactUpdate copyWith(
           void Function(EncryptedContent_ContactUpdate) updates) =>
@@ -1429,8 +1360,6 @@ class EncryptedContent_ContactUpdate extends $pb.GeneratedMessage {
       EncryptedContent_ContactUpdate._();
   @$core.override
   EncryptedContent_ContactUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_ContactUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_ContactUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_ContactUpdate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_ContactUpdate>(create);
@@ -1500,10 +1429,7 @@ class EncryptedContent_PushKeys extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.PushKeys',
       createEmptyInstance: create)
-    ..e<EncryptedContent_PushKeys_Type>(
+    ..aE<EncryptedContent_PushKeys_Type>(1, _omitFieldNames ? '' : 'type',
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_PushKeys_Type.REQUEST,
-        valueOf: EncryptedContent_PushKeys_Type.valueOf,
         enumValues: EncryptedContent_PushKeys_Type.values)
     ..aInt64(2, _omitFieldNames ? '' : 'keyId')
     ..a<$core.List<$core.int>>(
@@ -1512,8 +1438,7 @@ class EncryptedContent_PushKeys extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_PushKeys clone() =>
+  EncryptedContent_PushKeys clone() => deepCopy();
-      EncryptedContent_PushKeys()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_PushKeys copyWith(
           void Function(EncryptedContent_PushKeys) updates) =>
@@ -1527,8 +1452,6 @@ class EncryptedContent_PushKeys extends $pb.GeneratedMessage {
   static EncryptedContent_PushKeys create() => EncryptedContent_PushKeys._();
   @$core.override
   EncryptedContent_PushKeys createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_PushKeys> createRepeated() =>
-      $pb.PbList<EncryptedContent_PushKeys>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_PushKeys getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_PushKeys>(create);
@@ -1606,8 +1529,7 @@ class EncryptedContent_FlameSync extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_FlameSync clone() =>
+  EncryptedContent_FlameSync clone() => deepCopy();
-      EncryptedContent_FlameSync()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_FlameSync copyWith(
           void Function(EncryptedContent_FlameSync) updates) =>
@@ -1622,8 +1544,6 @@ class EncryptedContent_FlameSync extends $pb.GeneratedMessage {
   static EncryptedContent_FlameSync create() => EncryptedContent_FlameSync._();
   @$core.override
   EncryptedContent_FlameSync createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_FlameSync> createRepeated() =>
-      $pb.PbList<EncryptedContent_FlameSync>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_FlameSync getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_FlameSync>(create);
@@ -1695,8 +1615,7 @@ class EncryptedContent_TypingIndicator extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_TypingIndicator clone() =>
+  EncryptedContent_TypingIndicator clone() => deepCopy();
-      EncryptedContent_TypingIndicator()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_TypingIndicator copyWith(
           void Function(EncryptedContent_TypingIndicator) updates) =>
@@ -1712,8 +1631,6 @@ class EncryptedContent_TypingIndicator extends $pb.GeneratedMessage {
       EncryptedContent_TypingIndicator._();
   @$core.override
   EncryptedContent_TypingIndicator createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_TypingIndicator> createRepeated() =>
-      $pb.PbList<EncryptedContent_TypingIndicator>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_TypingIndicator getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_TypingIndicator>(
@@ -1766,8 +1683,7 @@ class EncryptedContent_UserDiscoveryRequest extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_UserDiscoveryRequest clone() =>
+  EncryptedContent_UserDiscoveryRequest clone() => deepCopy();
-      EncryptedContent_UserDiscoveryRequest()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_UserDiscoveryRequest copyWith(
           void Function(EncryptedContent_UserDiscoveryRequest) updates) =>
@@ -1783,8 +1699,6 @@ class EncryptedContent_UserDiscoveryRequest extends $pb.GeneratedMessage {
       EncryptedContent_UserDiscoveryRequest._();
   @$core.override
   EncryptedContent_UserDiscoveryRequest createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_UserDiscoveryRequest> createRepeated() =>
-      $pb.PbList<EncryptedContent_UserDiscoveryRequest>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_UserDiscoveryRequest getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1828,8 +1742,7 @@ class EncryptedContent_UserDiscoveryUpdate extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_UserDiscoveryUpdate clone() =>
+  EncryptedContent_UserDiscoveryUpdate clone() => deepCopy();
-      EncryptedContent_UserDiscoveryUpdate()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_UserDiscoveryUpdate copyWith(
           void Function(EncryptedContent_UserDiscoveryUpdate) updates) =>
@@ -1845,8 +1758,6 @@ class EncryptedContent_UserDiscoveryUpdate extends $pb.GeneratedMessage {
       EncryptedContent_UserDiscoveryUpdate._();
   @$core.override
   EncryptedContent_UserDiscoveryUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_UserDiscoveryUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_UserDiscoveryUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_UserDiscoveryUpdate getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1884,8 +1795,7 @@ class EncryptedContent_KeyVerificationProof extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_KeyVerificationProof clone() =>
+  EncryptedContent_KeyVerificationProof clone() => deepCopy();
-      EncryptedContent_KeyVerificationProof()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_KeyVerificationProof copyWith(
           void Function(EncryptedContent_KeyVerificationProof) updates) =>
@@ -1901,8 +1811,6 @@ class EncryptedContent_KeyVerificationProof extends $pb.GeneratedMessage {
       EncryptedContent_KeyVerificationProof._();
   @$core.override
   EncryptedContent_KeyVerificationProof createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_KeyVerificationProof> createRepeated() =>
-      $pb.PbList<EncryptedContent_KeyVerificationProof>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_KeyVerificationProof getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -2050,7 +1958,7 @@ class EncryptedContent extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent clone() => EncryptedContent()..mergeFromMessage(this);
+  EncryptedContent clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent copyWith(void Function(EncryptedContent) updates) =>
       super.copyWith((message) => updates(message as EncryptedContent))
@@ -2063,8 +1971,6 @@ class EncryptedContent extends $pb.GeneratedMessage {
   static EncryptedContent create() => EncryptedContent._();
   @$core.override
   EncryptedContent createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent> createRepeated() =>
-      $pb.PbList<EncryptedContent>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent>(create);

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -58,8 +58,7 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedPushNotification clone() =>
+  EncryptedPushNotification clone() => deepCopy();
-      EncryptedPushNotification()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedPushNotification copyWith(
           void Function(EncryptedPushNotification) updates) =>
@@ -73,8 +72,6 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
   static EncryptedPushNotification create() => EncryptedPushNotification._();
   @$core.override
   EncryptedPushNotification createEmptyInstance() => create();
-  static $pb.PbList<EncryptedPushNotification> createRepeated() =>
-      $pb.PbList<EncryptedPushNotification>();
   @$core.pragma('dart2js:noInline')
   static EncryptedPushNotification getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedPushNotification>(create);
@@ -142,16 +139,14 @@ class PushNotification extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'PushNotification',
       createEmptyInstance: create)
-    ..e<PushKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE,
+    ..aE<PushKind>(1, _omitFieldNames ? '' : 'kind',
-        defaultOrMaker: PushKind.REACTION,
-        valueOf: PushKind.valueOf,
         enumValues: PushKind.values)
     ..aOS(2, _omitFieldNames ? '' : 'messageId')
     ..aOS(3, _omitFieldNames ? '' : 'additionalContent')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PushNotification clone() => PushNotification()..mergeFromMessage(this);
+  PushNotification clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushNotification copyWith(void Function(PushNotification) updates) =>
       super.copyWith((message) => updates(message as PushNotification))
@@ -164,8 +159,6 @@ class PushNotification extends $pb.GeneratedMessage {
   static PushNotification create() => PushNotification._();
   @$core.override
   PushNotification createEmptyInstance() => create();
-  static $pb.PbList<PushNotification> createRepeated() =>
-      $pb.PbList<PushNotification>();
   @$core.pragma('dart2js:noInline')
   static PushNotification getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<PushNotification>(create);
@@ -220,12 +213,12 @@ class PushUsers extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'PushUsers',
       createEmptyInstance: create)
-    ..pc<PushUser>(1, _omitFieldNames ? '' : 'users', $pb.PbFieldType.PM,
+    ..pPM<PushUser>(1, _omitFieldNames ? '' : 'users',
         subBuilder: PushUser.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PushUsers clone() => PushUsers()..mergeFromMessage(this);
+  PushUsers clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushUsers copyWith(void Function(PushUsers) updates) =>
       super.copyWith((message) => updates(message as PushUsers)) as PushUsers;
@@ -237,7 +230,6 @@ class PushUsers extends $pb.GeneratedMessage {
   static PushUsers create() => PushUsers._();
   @$core.override
   PushUsers createEmptyInstance() => create();
-  static $pb.PbList<PushUsers> createRepeated() => $pb.PbList<PushUsers>();
   @$core.pragma('dart2js:noInline')
   static PushUsers getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUsers>(create);
@@ -280,12 +272,12 @@ class PushUser extends $pb.GeneratedMessage {
     ..aOS(2, _omitFieldNames ? '' : 'displayName')
     ..aOB(3, _omitFieldNames ? '' : 'blocked')
     ..aOS(4, _omitFieldNames ? '' : 'lastMessageId')
-    ..pc<PushKey>(5, _omitFieldNames ? '' : 'pushKeys', $pb.PbFieldType.PM,
+    ..pPM<PushKey>(5, _omitFieldNames ? '' : 'pushKeys',
         subBuilder: PushKey.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PushUser clone() => PushUser()..mergeFromMessage(this);
+  PushUser clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushUser copyWith(void Function(PushUser) updates) =>
       super.copyWith((message) => updates(message as PushUser)) as PushUser;
@@ -297,7 +289,6 @@ class PushUser extends $pb.GeneratedMessage {
   static PushUser create() => PushUser._();
   @$core.override
   PushUser createEmptyInstance() => create();
-  static $pb.PbList<PushUser> createRepeated() => $pb.PbList<PushUser>();
   @$core.pragma('dart2js:noInline')
   static PushUser getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUser>(create);
@@ -376,7 +367,7 @@ class PushKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PushKey clone() => PushKey()..mergeFromMessage(this);
+  PushKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushKey copyWith(void Function(PushKey) updates) =>
       super.copyWith((message) => updates(message as PushKey)) as PushKey;
@@ -388,7 +379,6 @@ class PushKey extends $pb.GeneratedMessage {
   static PushKey create() => PushKey._();
   @$core.override
   PushKey createEmptyInstance() => create();
-  static $pb.PbList<PushKey> createRepeated() => $pb.PbList<PushKey>();
   @$core.pragma('dart2js:noInline')
   static PushKey getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushKey>(create);

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -44,16 +44,14 @@ class QREnvelope extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'QREnvelope',
       createEmptyInstance: create)
-    ..e<QREnvelope_Type>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
+    ..aE<QREnvelope_Type>(2, _omitFieldNames ? '' : 'type',
-        defaultOrMaker: QREnvelope_Type.PUBLIC_PROFILE,
-        valueOf: QREnvelope_Type.valueOf,
         enumValues: QREnvelope_Type.values)
     ..a<$core.List<$core.int>>(
         3, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  QREnvelope clone() => QREnvelope()..mergeFromMessage(this);
+  QREnvelope clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   QREnvelope copyWith(void Function(QREnvelope) updates) =>
       super.copyWith((message) => updates(message as QREnvelope)) as QREnvelope;
@@ -65,7 +63,6 @@ class QREnvelope extends $pb.GeneratedMessage {
   static QREnvelope create() => QREnvelope._();
   @$core.override
   QREnvelope createEmptyInstance() => create();
-  static $pb.PbList<QREnvelope> createRepeated() => $pb.PbList<QREnvelope>();
   @$core.pragma('dart2js:noInline')
   static QREnvelope getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<QREnvelope>(create);
@@ -142,7 +139,7 @@ class PublicProfile extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PublicProfile clone() => PublicProfile()..mergeFromMessage(this);
+  PublicProfile clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PublicProfile copyWith(void Function(PublicProfile) updates) =>
       super.copyWith((message) => updates(message as PublicProfile))
@@ -155,8 +152,6 @@ class PublicProfile extends $pb.GeneratedMessage {
   static PublicProfile create() => PublicProfile._();
   @$core.override
   PublicProfile createEmptyInstance() => create();
-  static $pb.PbList<PublicProfile> createRepeated() =>
-      $pb.PbList<PublicProfile>();
   @$core.pragma('dart2js:noInline')
   static PublicProfile getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<PublicProfile>(create);

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

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 

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

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;

lib/src/model/protobuf/client/generated/user_discovery/types.pb.dart

@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -41,14 +41,13 @@ class UserDiscoveryVersion extends $pb.GeneratedMessage {
       _omitMessageNames ? '' : 'UserDiscoveryVersion',
       package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
       createEmptyInstance: create)
-    ..a<$core.int>(
+    ..aI(1, _omitFieldNames ? '' : 'announcement',
-        1, _omitFieldNames ? '' : 'announcement', $pb.PbFieldType.OU3)
+        fieldType: $pb.PbFieldType.OU3)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'promotion', $pb.PbFieldType.OU3)
+    ..aI(2, _omitFieldNames ? '' : 'promotion', fieldType: $pb.PbFieldType.OU3)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UserDiscoveryVersion clone() =>
+  UserDiscoveryVersion clone() => deepCopy();
-      UserDiscoveryVersion()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryVersion copyWith(void Function(UserDiscoveryVersion) updates) =>
       super.copyWith((message) => updates(message as UserDiscoveryVersion))
@@ -61,8 +60,6 @@ class UserDiscoveryVersion extends $pb.GeneratedMessage {
   static UserDiscoveryVersion create() => UserDiscoveryVersion._();
   @$core.override
   UserDiscoveryVersion createEmptyInstance() => create();
-  static $pb.PbList<UserDiscoveryVersion> createRepeated() =>
-      $pb.PbList<UserDiscoveryVersion>();
   @$core.pragma('dart2js:noInline')
   static UserDiscoveryVersion getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<UserDiscoveryVersion>(create);
@@ -93,12 +90,14 @@ class UserDiscoveryMessage_UserDiscoveryAnnouncement
     $fixnum.Int64? publicId,
     $core.int? threshold,
     $core.List<$core.int>? announcementShare,
+    $core.bool? sharePromotion,
     $core.Iterable<$core.List<$core.int>>? verificationShares,
   }) {
     final result = create();
     if (publicId != null) result.publicId = publicId;
     if (threshold != null) result.threshold = threshold;
     if (announcementShare != null) result.announcementShare = announcementShare;
+    if (sharePromotion != null) result.sharePromotion = sharePromotion;
     if (verificationShares != null)
       result.verificationShares.addAll(verificationShares);
     return result;
@@ -120,16 +119,16 @@ class UserDiscoveryMessage_UserDiscoveryAnnouncement
       package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
       createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'publicId')
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'threshold', $pb.PbFieldType.OU3)
+    ..aI(2, _omitFieldNames ? '' : 'threshold', fieldType: $pb.PbFieldType.OU3)
     ..a<$core.List<$core.int>>(
-        4, _omitFieldNames ? '' : 'announcementShare', $pb.PbFieldType.OY)
+        3, _omitFieldNames ? '' : 'announcementShare', $pb.PbFieldType.OY)
+    ..aOB(4, _omitFieldNames ? '' : 'sharePromotion')
     ..p<$core.List<$core.int>>(
-        6, _omitFieldNames ? '' : 'verificationShares', $pb.PbFieldType.PY)
+        5, _omitFieldNames ? '' : 'verificationShares', $pb.PbFieldType.PY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UserDiscoveryMessage_UserDiscoveryAnnouncement clone() =>
+  UserDiscoveryMessage_UserDiscoveryAnnouncement clone() => deepCopy();
-      UserDiscoveryMessage_UserDiscoveryAnnouncement()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryMessage_UserDiscoveryAnnouncement copyWith(
           void Function(UserDiscoveryMessage_UserDiscoveryAnnouncement)
@@ -147,9 +146,6 @@ class UserDiscoveryMessage_UserDiscoveryAnnouncement
   @$core.override
   UserDiscoveryMessage_UserDiscoveryAnnouncement createEmptyInstance() =>
       create();
-  static $pb.PbList<UserDiscoveryMessage_UserDiscoveryAnnouncement>
-      createRepeated() =>
-          $pb.PbList<UserDiscoveryMessage_UserDiscoveryAnnouncement>();
   @$core.pragma('dart2js:noInline')
   static UserDiscoveryMessage_UserDiscoveryAnnouncement getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -174,17 +170,26 @@ class UserDiscoveryMessage_UserDiscoveryAnnouncement
   @$pb.TagNumber(2)
   void clearThreshold() => $_clearField(2);
 
-  @$pb.TagNumber(4)
+  @$pb.TagNumber(3)
   $core.List<$core.int> get announcementShare => $_getN(2);
-  @$pb.TagNumber(4)
+  @$pb.TagNumber(3)
   set announcementShare($core.List<$core.int> value) => $_setBytes(2, value);
-  @$pb.TagNumber(4)
+  @$pb.TagNumber(3)
   $core.bool hasAnnouncementShare() => $_has(2);
-  @$pb.TagNumber(4)
+  @$pb.TagNumber(3)
-  void clearAnnouncementShare() => $_clearField(4);
+  void clearAnnouncementShare() => $_clearField(3);
 
-  @$pb.TagNumber(6)
+  @$pb.TagNumber(4)
-  $pb.PbList<$core.List<$core.int>> get verificationShares => $_getList(3);
+  $core.bool get sharePromotion => $_getBF(3);
+  @$pb.TagNumber(4)
+  set sharePromotion($core.bool value) => $_setBool(3, value);
+  @$pb.TagNumber(4)
+  $core.bool hasSharePromotion() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSharePromotion() => $_clearField(4);
+
+  @$pb.TagNumber(5)
+  $pb.PbList<$core.List<$core.int>> get verificationShares => $_getList(4);
 }
 
 class UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
@@ -226,9 +231,7 @@ class UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_Sig
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
-      clone() =>
+      clone() => deepCopy();
-          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData()
-            ..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData copyWith(
           void Function(
@@ -249,10 +252,6 @@ class UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_Sig
   @$core.override
   UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
       createEmptyInstance() => create();
-  static $pb.PbList<
-          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData>
-      createRepeated() => $pb.PbList<
-          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData>();
   @$core.pragma('dart2js:noInline')
   static UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
       getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -330,9 +329,7 @@ class UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
-      clone() =>
+      clone() => deepCopy();
-          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted()
-            ..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted copyWith(
           void Function(
@@ -353,10 +350,6 @@ class UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
   @$core.override
   UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
       createEmptyInstance() => create();
-  static $pb.PbList<
-          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted>
-      createRepeated() => $pb.PbList<
-          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted>();
   @$core.pragma('dart2js:noInline')
   static UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
       getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -424,17 +417,17 @@ class UserDiscoveryMessage_UserDiscoveryPromotion extends $pb.GeneratedMessage {
       _omitMessageNames ? '' : 'UserDiscoveryMessage.UserDiscoveryPromotion',
       package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
       createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'promotionId', $pb.PbFieldType.OU3)
+    ..aI(1, _omitFieldNames ? '' : 'promotionId',
+        fieldType: $pb.PbFieldType.OU3)
     ..aInt64(2, _omitFieldNames ? '' : 'publicId')
-    ..a<$core.int>(3, _omitFieldNames ? '' : 'threshold', $pb.PbFieldType.OU3)
+    ..aI(3, _omitFieldNames ? '' : 'threshold', fieldType: $pb.PbFieldType.OU3)
     ..a<$core.List<$core.int>>(
         5, _omitFieldNames ? '' : 'announcementShare', $pb.PbFieldType.OY)
     ..aInt64(6, _omitFieldNames ? '' : 'publicKeyVerifiedTimestamp')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UserDiscoveryMessage_UserDiscoveryPromotion clone() =>
+  UserDiscoveryMessage_UserDiscoveryPromotion clone() => deepCopy();
-      UserDiscoveryMessage_UserDiscoveryPromotion()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryMessage_UserDiscoveryPromotion copyWith(
           void Function(UserDiscoveryMessage_UserDiscoveryPromotion) updates) =>
@@ -450,9 +443,6 @@ class UserDiscoveryMessage_UserDiscoveryPromotion extends $pb.GeneratedMessage {
       UserDiscoveryMessage_UserDiscoveryPromotion._();
   @$core.override
   UserDiscoveryMessage_UserDiscoveryPromotion createEmptyInstance() => create();
-  static $pb.PbList<UserDiscoveryMessage_UserDiscoveryPromotion>
-      createRepeated() =>
-          $pb.PbList<UserDiscoveryMessage_UserDiscoveryPromotion>();
   @$core.pragma('dart2js:noInline')
   static UserDiscoveryMessage_UserDiscoveryPromotion getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -532,8 +522,7 @@ class UserDiscoveryMessage_UserDiscoveryRecall extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UserDiscoveryMessage_UserDiscoveryRecall clone() =>
+  UserDiscoveryMessage_UserDiscoveryRecall clone() => deepCopy();
-      UserDiscoveryMessage_UserDiscoveryRecall()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryMessage_UserDiscoveryRecall copyWith(
           void Function(UserDiscoveryMessage_UserDiscoveryRecall) updates) =>
@@ -549,9 +538,6 @@ class UserDiscoveryMessage_UserDiscoveryRecall extends $pb.GeneratedMessage {
       UserDiscoveryMessage_UserDiscoveryRecall._();
   @$core.override
   UserDiscoveryMessage_UserDiscoveryRecall createEmptyInstance() => create();
-  static $pb.PbList<UserDiscoveryMessage_UserDiscoveryRecall>
-      createRepeated() =>
-          $pb.PbList<UserDiscoveryMessage_UserDiscoveryRecall>();
   @$core.pragma('dart2js:noInline')
   static UserDiscoveryMessage_UserDiscoveryRecall getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -613,8 +599,7 @@ class UserDiscoveryMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UserDiscoveryMessage clone() =>
+  UserDiscoveryMessage clone() => deepCopy();
-      UserDiscoveryMessage()..mergeFromMessage(this);
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UserDiscoveryMessage copyWith(void Function(UserDiscoveryMessage) updates) =>
       super.copyWith((message) => updates(message as UserDiscoveryMessage))
@@ -627,8 +612,6 @@ class UserDiscoveryMessage extends $pb.GeneratedMessage {
   static UserDiscoveryMessage create() => UserDiscoveryMessage._();
   @$core.override
   UserDiscoveryMessage createEmptyInstance() => create();
-  static $pb.PbList<UserDiscoveryMessage> createRepeated() =>
-      $pb.PbList<UserDiscoveryMessage>();
   @$core.pragma('dart2js:noInline')
   static UserDiscoveryMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<UserDiscoveryMessage>(create);

lib/src/model/protobuf/client/generated/user_discovery/types.pbenum.dart

@@ -8,4 +8,4 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports

lib/src/model/protobuf/client/generated/user_discovery/types.pbjson.dart

@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -91,14 +92,15 @@ const UserDiscoveryMessage_UserDiscoveryAnnouncement$json = {
     {'1': 'threshold', '3': 2, '4': 1, '5': 13, '10': 'threshold'},
     {
       '1': 'announcement_share',
-      '3': 4,
+      '3': 3,
       '4': 1,
       '5': 12,
       '10': 'announcementShare'
     },
+    {'1': 'share_promotion', '3': 4, '4': 1, '5': 8, '10': 'sharePromotion'},
     {
       '1': 'verification_shares',
-      '3': 6,
+      '3': 5,
       '4': 3,
       '5': 12,
       '10': 'verificationShares'
@@ -188,20 +190,21 @@ final $typed_data.Uint8List userDiscoveryMessageDescriptor = $convert.base64Deco
     'lzY292ZXJ5TWVzc2FnZS5Vc2VyRGlzY292ZXJ5UHJvbW90aW9uSAFSFnVzZXJEaXNjb3ZlcnlQ'
     'cm9tb3Rpb26IAQEScQoVdXNlcl9kaXNjb3ZlcnlfcmVjYWxsGAQgASgLMjgudXNlcl9kaXNjb3'
     'ZlcnkuVXNlckRpc2NvdmVyeU1lc3NhZ2UuVXNlckRpc2NvdmVyeVJlY2FsbEgCUhN1c2VyRGlz'
-    'Y292ZXJ5UmVjYWxsiAEBGrYBChlVc2VyRGlzY292ZXJ5QW5ub3VuY2VtZW50EhsKCXB1YmxpY1'
+    'Y292ZXJ5UmVjYWxsiAEBGt8BChlVc2VyRGlzY292ZXJ5QW5ub3VuY2VtZW50EhsKCXB1YmxpY1'
     '9pZBgBIAEoA1IIcHVibGljSWQSHAoJdGhyZXNob2xkGAIgASgNUgl0aHJlc2hvbGQSLQoSYW5u'
-    'b3VuY2VtZW50X3NoYXJlGAQgASgMUhFhbm5vdW5jZW1lbnRTaGFyZRIvChN2ZXJpZmljYXRpb2'
+    'b3VuY2VtZW50X3NoYXJlGAMgASgMUhFhbm5vdW5jZW1lbnRTaGFyZRInCg9zaGFyZV9wcm9tb3'
-    '5fc2hhcmVzGAYgAygMUhJ2ZXJpZmljYXRpb25TaGFyZXMatAQKFlVzZXJEaXNjb3ZlcnlQcm9t'
+    'Rpb24YBCABKAhSDnNoYXJlUHJvbW90aW9uEi8KE3ZlcmlmaWNhdGlvbl9zaGFyZXMYBSADKAxS'
-    'b3Rpb24SIQoMcHJvbW90aW9uX2lkGAEgASgNUgtwcm9tb3Rpb25JZBIbCglwdWJsaWNfaWQYAi'
+    'EnZlcmlmaWNhdGlvblNoYXJlcxq0BAoWVXNlckRpc2NvdmVyeVByb21vdGlvbhIhCgxwcm9tb3'
-    'ABKANSCHB1YmxpY0lkEhwKCXRocmVzaG9sZBgDIAEoDVIJdGhyZXNob2xkEi0KEmFubm91bmNl'
+    'Rpb25faWQYASABKA1SC3Byb21vdGlvbklkEhsKCXB1YmxpY19pZBgCIAEoA1IIcHVibGljSWQS'
-    'bWVudF9zaGFyZRgFIAEoDFIRYW5ub3VuY2VtZW50U2hhcmUSRgodcHVibGljX2tleV92ZXJpZm'
+    'HAoJdGhyZXNob2xkGAMgASgNUgl0aHJlc2hvbGQSLQoSYW5ub3VuY2VtZW50X3NoYXJlGAUgAS'
-    'llZF90aW1lc3RhbXAYBiABKANIAFIacHVibGljS2V5VmVyaWZpZWRUaW1lc3RhbXCIAQEaogIK'
+    'gMUhFhbm5vdW5jZW1lbnRTaGFyZRJGCh1wdWJsaWNfa2V5X3ZlcmlmaWVkX3RpbWVzdGFtcBgG'
-    'GkFubm91bmNlbWVudFNoYXJlRGVjcnlwdGVkEoIBCgtzaWduZWRfZGF0YRgBIAEoCzJhLnVzZX'
+    'IAEoA0gAUhpwdWJsaWNLZXlWZXJpZmllZFRpbWVzdGFtcIgBARqiAgoaQW5ub3VuY2VtZW50U2'
-    'JfZGlzY292ZXJ5LlVzZXJEaXNjb3ZlcnlNZXNzYWdlLlVzZXJEaXNjb3ZlcnlQcm9tb3Rpb24u'
+    'hhcmVEZWNyeXB0ZWQSggEKC3NpZ25lZF9kYXRhGAEgASgLMmEudXNlcl9kaXNjb3ZlcnkuVXNl'
-    'QW5ub3VuY2VtZW50U2hhcmVEZWNyeXB0ZWQuU2lnbmVkRGF0YVIKc2lnbmVkRGF0YRIcCglzaW'
+    'ckRpc2NvdmVyeU1lc3NhZ2UuVXNlckRpc2NvdmVyeVByb21vdGlvbi5Bbm5vdW5jZW1lbnRTaG'
-    'duYXR1cmUYAiABKAxSCXNpZ25hdHVyZRphCgpTaWduZWREYXRhEhsKCXB1YmxpY19pZBgBIAEo'
+    'FyZURlY3J5cHRlZC5TaWduZWREYXRhUgpzaWduZWREYXRhEhwKCXNpZ25hdHVyZRgCIAEoDFIJ'
-    'A1IIcHVibGljSWQSFwoHdXNlcl9pZBgCIAEoA1IGdXNlcklkEh0KCnB1YmxpY19rZXkYAyABKA'
+    'c2lnbmF0dXJlGmEKClNpZ25lZERhdGESGwoJcHVibGljX2lkGAEgASgDUghwdWJsaWNJZBIXCg'
-    'xSCXB1YmxpY0tleUIgCh5fcHVibGljX2tleV92ZXJpZmllZF90aW1lc3RhbXAaOAoTVXNlckRp'
+    'd1c2VyX2lkGAIgASgDUgZ1c2VySWQSHQoKcHVibGljX2tleRgDIAEoDFIJcHVibGljS2V5QiAK'
-    'c2NvdmVyeVJlY2FsbBIhCgxwcm9tb3Rpb25faWQYASABKANSC3Byb21vdGlvbklkQh4KHF91c2'
+    'Hl9wdWJsaWNfa2V5X3ZlcmlmaWVkX3RpbWVzdGFtcBo4ChNVc2VyRGlzY292ZXJ5UmVjYWxsEi'
-    'VyX2Rpc2NvdmVyeV9hbm5vdW5jZW1lbnRCGwoZX3VzZXJfZGlzY292ZXJ5X3Byb21vdGlvbkIY'
+    'EKDHByb21vdGlvbl9pZBgBIAEoA1ILcHJvbW90aW9uSWRCHgocX3VzZXJfZGlzY292ZXJ5X2Fu'
-    'ChZfdXNlcl9kaXNjb3ZlcnlfcmVjYWxs');
+    'bm91bmNlbWVudEIbChlfdXNlcl9kaXNjb3ZlcnlfcHJvbW90aW9uQhgKFl91c2VyX2Rpc2Nvdm'
+    'VyeV9yZWNhbGw=');

lib/src/services/notifications/fcm.notifications.dart

@@ -108,12 +108,10 @@ Future<void> initFCMService() async {
     options: DefaultFirebaseOptions.currentPlatform,
   );
 
-  await checkForTokenUpdates();
+  unawaited(checkForTokenUpdates());
 
   FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
 
-  await FirebaseMessaging.instance.requestPermission();
-
   FirebaseMessaging.onMessage.listen(handleRemoteMessage);
 }
 

lib/src/utils/log.dart

@@ -20,7 +20,7 @@ class Log {
       if (!kReleaseMode) {
         // ignore: avoid_print
         print(
-          '${record.level.name} [twonly] ${record.loggerName} > ${record.message}',
+          '${record.level.name} [${AppState.isInBackgroundTask ? 'b' : 'f'}] [twonly] ${record.loggerName} > ${record.message}',
         );
       }
     });

lib/src/visual/views/chats/chat_messages.view.dart

@@ -83,14 +83,14 @@ class _ChatMessagesViewState extends State<ChatMessagesView>
 
   Mutex protectMessageUpdating = Mutex();
 
-  @override
+  // @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
+  // void didChangeAppLifecycleState(AppLifecycleState state) {
-    if (state == AppLifecycleState.resumed) {
+  //   if (state == AppLifecycleState.resumed) {
-      protectMessageUpdating.protect(() async {
+  //     protectMessageUpdating.protect(() async {
-        await setMessages(allMessages, groupActions);
+  //       await setMessages(allMessages, groupActions);
-      });
+  //     });
-    }
+  //   }
-  }
+  // }
 
   bool _isViewActive() {
     return !AppState.isAppInBackground &&

lib/src/visual/views/chats/media_viewer.view.dart

@@ -8,8 +8,8 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lottie/lottie.dart';
 import 'package:mutex/mutex.dart';
-import 'package:no_screenshot/no_screenshot.dart';
 import 'package:photo_view/photo_view.dart';
+import 'package:screen_protector/screen_protector.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
@@ -29,15 +29,12 @@ import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/visual/components/animate_icon.comp.dart';
 import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
 import 'package:twonly/src/visual/helpers/media_view_sizing.helper.dart';
-import 'package:twonly/src/visual/helpers/video_player.helper.dart';
 import 'package:twonly/src/visual/loader/three_rotating_dots.loader.dart';
 import 'package:twonly/src/visual/views/camera/camera_send_to.view.dart';
 import 'package:twonly/src/visual/views/chats/media_viewer_components/additional_message_content.dart';
 import 'package:twonly/src/visual/views/chats/media_viewer_components/reaction_buttons.comp.dart';
 import 'package:video_player/video_player.dart';
 
-final NoScreenshot _noScreenshot = NoScreenshot.instance;
-
 class MediaViewerView extends StatefulWidget {
   const MediaViewerView(this.group, {super.key, this.initialMessage});
   final Group group;
@@ -58,6 +55,8 @@ class _MediaViewerViewState extends State<MediaViewerView> {
   // current image related
   VideoPlayerController? videoController;
 
+  VoidCallback? _videoListener;
+
   MediaFileService? currentMedia;
   Message? currentMessage;
 
@@ -76,11 +75,13 @@ class _MediaViewerViewState extends State<MediaViewerView> {
   StreamSubscription<MediaFile?>? downloadStateListener;
 
   List<Message> allMediaFiles = [];
-  late StreamSubscription<List<Message>> _subscription;
+  StreamSubscription<List<Message>>? _subscription;
   TextEditingController textMessageController = TextEditingController();
 
   final HashSet<String> _alreadyOpenedMediaIds = HashSet();
 
+  bool _isTransitioning = false;
+
   @override
   void initState() {
     super.initState();
@@ -97,15 +98,27 @@ class _MediaViewerViewState extends State<MediaViewerView> {
   void dispose() {
     nextMediaTimer?.cancel();
     progressTimer?.cancel();
-    _noScreenshot.screenshotOn();
+    _subscription?.cancel();
-    _subscription.cancel();
     downloadStateListener?.cancel();
-    final tmp = videoController;
+
-    videoController = null;
+    ScreenProtector.preventScreenshotOff();
-    tmp?.dispose();
+
+    _disposeVideoController();
+
     super.dispose();
   }
 
+  void _disposeVideoController() {
+    final listener = _videoListener;
+    final controller = videoController;
+    _videoListener = null;
+    videoController = null;
+    if (listener != null) {
+      controller?.removeListener(listener);
+    }
+    controller?.dispose();
+  }
+
   final Mutex _messageUpdateLock = Mutex();
 
   bool _isViewActive() {
@@ -154,33 +167,41 @@ class _MediaViewerViewState extends State<MediaViewerView> {
   }
 
   Future<void> nextMediaOrExit() async {
-    /// Remove the current media file in case it is not set to unlimited
+    if (_isTransitioning) return;
-    if (currentMedia != null) {
+    _isTransitioning = true;
-      if (!imageSaved &&
-          currentMedia!.mediaFile.displayLimitInMilliseconds != null) {
-        currentMedia!.fullMediaRemoval();
-      }
-    }
 
-    await videoController?.dispose();
+    try {
-    if (!mounted) return;
+      /// Remove the current media file in case it is not set to unlimited
-
+      if (currentMedia != null) {
-    nextMediaTimer?.cancel();
+        if (!imageSaved &&
-    progressTimer?.cancel();
+            currentMedia!.mediaFile.displayLimitInMilliseconds != null) {
-
+          currentMedia!.fullMediaRemoval();
-    if (allMediaFiles.isEmpty) {
-      final group = await twonlyDB.groupsDao.getGroup(widget.group.groupId);
-      if (mounted) {
-        if (group != null &&
-            group.draftMessage != null &&
-            group.draftMessage != '') {
-          context.replace(Routes.chatsMessages(group.groupId));
-        } else {
-          Navigator.pop(context);
         }
       }
-    } else {
+
-      await loadCurrentMediaFile();
+      _disposeVideoController();
+
+      if (!mounted) return;
+
+      nextMediaTimer?.cancel();
+      progressTimer?.cancel();
+
+      if (allMediaFiles.isEmpty) {
+        final group = await twonlyDB.groupsDao.getGroup(widget.group.groupId);
+        if (mounted) {
+          if (group != null &&
+              group.draftMessage != null &&
+              group.draftMessage != '') {
+            context.replace(Routes.chatsMessages(group.groupId));
+          } else {
+            Navigator.pop(context);
+          }
+        }
+      } else {
+        await loadCurrentMediaFile();
+      }
+    } finally {
+      if (mounted) _isTransitioning = false;
     }
   }
 
@@ -189,7 +210,14 @@ class _MediaViewerViewState extends State<MediaViewerView> {
     if (allMediaFiles.isEmpty || allMediaFiles.first.mediaId == null) {
       return nextMediaOrExit();
     }
-    await _noScreenshot.screenshotOff();
+
+    try {
+      await ScreenProtector.preventScreenshotOn();
+    } catch (e) {
+      Log.error(e);
+    }
+
+    if (!mounted) return;
 
     setState(() {
       videoController = null;
@@ -277,11 +305,15 @@ class _MediaViewerViewState extends State<MediaViewerView> {
         context.lang.mediaViewerAuthReason,
         force: false,
       );
+      if (!mounted) return;
+
       if (!isAuth) {
         await nextMediaOrExit();
-        setState(() {
+        if (mounted) {
-          displayTwonlyPresent = false;
+          setState(() {
-        });
+            displayTwonlyPresent = false;
+          });
+        }
         return;
       }
     }
@@ -297,6 +329,9 @@ class _MediaViewerViewState extends State<MediaViewerView> {
       final sender = await twonlyDB.contactsDao.getContactById(
         currentMessage!.senderId!,
       );
+
+      if (!mounted) return;
+
       if (sender != null) {
         _currentMediaSender =
             '${getContactDisplayName(sender)} (${widget.group.groupName})';
@@ -308,6 +343,8 @@ class _MediaViewerViewState extends State<MediaViewerView> {
       [currentMessage!.messageId],
     );
 
+    if (!mounted) return;
+
     if (!currentMediaLocal.tempPath.existsSync()) {
       Log.error('Temp media file not found...');
       await handleMediaError(currentMediaLocal.mediaFile);
@@ -317,7 +354,7 @@ class _MediaViewerViewState extends State<MediaViewerView> {
     var timerRequired = false;
 
     if (currentMediaLocal.mediaFile.type == MediaType.video) {
-      videoController = VideoPlayerController.file(
+      final controller = VideoPlayerController.file(
         currentMediaLocal.tempPath,
         videoPlayerOptions: VideoPlayerOptions(
           // only mix in case the video can be played multiple times,
@@ -326,32 +363,54 @@ class _MediaViewerViewState extends State<MediaViewerView> {
               currentMediaLocal.mediaFile.displayLimitInMilliseconds == null,
         ),
       );
-      await videoController?.setLooping(
+
+      await controller.setLooping(
         currentMediaLocal.mediaFile.displayLimitInMilliseconds == null,
       );
-      await videoController
+
-          ?.initialize()
+      if (!mounted) {
+        await controller.dispose();
+        return;
+      }
+
+      await controller
+          .initialize()
           .then((_) {
-            if (videoController == null) return;
+            if (!mounted || videoController != null) {
-            videoController?.play();
+              controller.dispose();
-            videoController?.addListener(() {
+              return;
-              setState(() {
+            }
-                progress =
+
-                    1 -
+            void listener() {
-                    videoController!.value.position.inSeconds /
+              if (!mounted) return;
-                        videoController!.value.duration.inSeconds;
+              final ctrl = videoController;
-              });
+              if (ctrl == null) return;
+
+              final duration = ctrl.value.duration.inSeconds;
+              if (duration > 0) {
+                setState(() {
+                  progress = 1 - ctrl.value.position.inSeconds / duration;
+                });
+              }
+
               if (currentMediaLocal.mediaFile.displayLimitInMilliseconds !=
                   null) {
-                if (videoController?.value.position ==
+                if (ctrl.value.position == ctrl.value.duration) {
-                    videoController?.value.duration) {
                   nextMediaOrExit();
                 }
               }
-            });
+            }
+
+            _videoListener = listener;
+            videoController = controller;
+            controller
+              ..addListener(listener)
+              ..play();
           })
           // ignore: argument_type_not_assignable_to_error_handler, invalid_return_type_for_catch_error
           .catchError(Log.error);
+
+      if (!mounted) return;
     } else {
       if (currentMediaLocal.mediaFile.displayLimitInMilliseconds != null) {
         canBeSeenUntil = clock.now().add(
@@ -602,9 +661,8 @@ class _MediaViewerViewState extends State<MediaViewerView> {
                           child: PhotoView.customChild(
                             initialScale: PhotoViewComputedScale.contained,
                             minScale: PhotoViewComputedScale.contained,
-                            child: VideoPlayerHelper(
+                            child: VideoPlayer(
-                              controller: videoController!,
+                              videoController!,
-                              onDoubleTap: onTap,
                             ),
                           ),
                         )

lib/src/visual/views/settings/settings_main.view.dart

@@ -8,141 +8,134 @@ import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
 import 'package:twonly/src/visual/elements/better_list_title.element.dart';
 
-class SettingsMainView extends StatefulWidget {
+class SettingsMainView extends StatelessWidget {
   const SettingsMainView({super.key});
 
-  @override
-  State<SettingsMainView> createState() => _SettingsMainViewState();
-}
-
-class _SettingsMainViewState extends State<SettingsMainView> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: Text(context.lang.settingsTitle),
       ),
-      body: ListView(
+      body: StreamBuilder(
-        children: [
+        stream: userService.onUserUpdated,
-          Padding(
+        builder: (context, asyncSnapshot) {
-            padding: const EdgeInsets.all(30),
+          return ListView(
-            child: Row(
+            children: [
-              children: [
+              Padding(
-                Expanded(
+                padding: const EdgeInsets.all(30),
-                  child: GestureDetector(
+                child: Row(
-                    onTap: () async {
+                  children: [
-                      await context.push(Routes.settingsProfile);
+                    Expanded(
-                      setState(() {});
+                      child: GestureDetector(
-                    },
+                        onTap: () => context.push(Routes.settingsProfile),
-                    child: ColoredBox(
+                        child: ColoredBox(
-                      color: context.color.surface.withAlpha(0),
+                          color: context.color.surface.withAlpha(0),
-                      child: Row(
+                          child: Row(
-                        children: [
-                          const AvatarIcon(
-                            myAvatar: true,
-                            fontSize: 30,
-                          ),
-                          Container(width: 20, color: Colors.transparent),
-                          Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              Text(
+                              const AvatarIcon(
-                                substringBy(
+                                myAvatar: true,
-                                  userService.currentUser.displayName,
+                                fontSize: 30,
-                                  27,
-                                ),
-                                style: const TextStyle(fontSize: 20),
-                                textAlign: TextAlign.left,
                               ),
-                              Text(
+                              Container(width: 20, color: Colors.transparent),
-                                userService.currentUser.username,
+                              Column(
-                                style: const TextStyle(
+                                crossAxisAlignment: CrossAxisAlignment.start,
-                                  fontSize: 14,
+                                children: [
-                                ),
+                                  Text(
-                                textAlign: TextAlign.left,
+                                    substringBy(
+                                      userService.currentUser.displayName,
+                                      27,
+                                    ),
+                                    style: const TextStyle(fontSize: 20),
+                                    textAlign: TextAlign.left,
+                                  ),
+                                  Text(
+                                    userService.currentUser.username,
+                                    style: const TextStyle(
+                                      fontSize: 14,
+                                    ),
+                                    textAlign: TextAlign.left,
+                                  ),
+                                ],
                               ),
                             ],
                           ),
-                        ],
+                        ),
                       ),
                     ),
-                  ),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: IconButton(
+                        onPressed: () =>
+                            context.push(Routes.settingsPublicProfile),
+                        icon: const FaIcon(FontAwesomeIcons.qrcode),
+                      ),
+                    ),
+                  ],
                 ),
-                Align(
+              ),
-                  alignment: Alignment.centerRight,
+              BetterListTile(
-                  child: IconButton(
+                icon: FontAwesomeIcons.user,
-                    onPressed: () => context.push(Routes.settingsPublicProfile),
+                text: context.lang.settingsAccount,
-                    icon: const FaIcon(FontAwesomeIcons.qrcode),
+                onTap: () => context.push(Routes.settingsAccount),
-                  ),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.shieldHeart,
+                text: context.lang.settingsSubscription,
+                onTap: () => context.push(Routes.settingsSubscription),
+              ),
+              BetterListTile(
+                icon: Icons.lock_clock_rounded,
+                text: context.lang.settingsBackup,
+                onTap: () => context.push(Routes.settingsBackup),
+              ),
+              const Divider(),
+              BetterListTile(
+                icon: FontAwesomeIcons.sun,
+                text: context.lang.settingsAppearance,
+                onTap: () => context.push(Routes.settingsAppearance),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.comment,
+                text: context.lang.settingsChats,
+                onTap: () => context.push(Routes.settingsChats),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.lock,
+                text: context.lang.settingsPrivacy,
+                onTap: () => context.push(Routes.settingsPrivacy),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.bell,
+                text: context.lang.settingsNotification,
+                onTap: () => context.push(Routes.settingsNotification),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.chartPie,
+                iconSize: 15,
+                text: context.lang.settingsStorageData,
+                onTap: () => context.push(Routes.settingsStorage),
+              ),
+              const Divider(),
+              BetterListTile(
+                icon: FontAwesomeIcons.circleQuestion,
+                text: context.lang.settingsHelp,
+                onTap: () => context.push(Routes.settingsHelp),
+              ),
+              if (userService.currentUser.isDeveloper)
+                BetterListTile(
+                  icon: FontAwesomeIcons.code,
+                  text: 'Developer Settings',
+                  onTap: () => context.push(Routes.settingsDeveloper),
                 ),
-              ],
+              BetterListTile(
-            ),
+                icon: FontAwesomeIcons.shareFromSquare,
-          ),
+                text: context.lang.inviteFriends,
-          BetterListTile(
+                onTap: () => context.push(Routes.settingsInvite),
-            icon: FontAwesomeIcons.user,
+              ),
-            text: context.lang.settingsAccount,
+            ],
-            onTap: () => context.push(Routes.settingsAccount),
+          );
-          ),
+        },
-          BetterListTile(
-            icon: FontAwesomeIcons.shieldHeart,
-            text: context.lang.settingsSubscription,
-            onTap: () => context.push(Routes.settingsSubscription),
-          ),
-          BetterListTile(
-            icon: Icons.lock_clock_rounded,
-            text: context.lang.settingsBackup,
-            onTap: () => context.push(Routes.settingsBackup),
-          ),
-          const Divider(),
-          BetterListTile(
-            icon: FontAwesomeIcons.sun,
-            text: context.lang.settingsAppearance,
-            onTap: () => context.push(Routes.settingsAppearance),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.comment,
-            text: context.lang.settingsChats,
-            onTap: () => context.push(Routes.settingsChats),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.lock,
-            text: context.lang.settingsPrivacy,
-            onTap: () => context.push(Routes.settingsPrivacy),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.bell,
-            text: context.lang.settingsNotification,
-            onTap: () => context.push(Routes.settingsNotification),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.chartPie,
-            iconSize: 15,
-            text: context.lang.settingsStorageData,
-            onTap: () => context.push(Routes.settingsStorage),
-          ),
-          const Divider(),
-          BetterListTile(
-            icon: FontAwesomeIcons.circleQuestion,
-            text: context.lang.settingsHelp,
-            onTap: () async {
-              await context.push(Routes.settingsHelp);
-              setState(() {
-                // appSession.currentUser could have been changed
-              });
-            },
-          ),
-          if (userService.currentUser.isDeveloper)
-            BetterListTile(
-              icon: FontAwesomeIcons.code,
-              text: 'Developer Settings',
-              onTap: () => context.push(Routes.settingsDeveloper),
-            ),
-          BetterListTile(
-            icon: FontAwesomeIcons.shareFromSquare,
-            text: context.lang.inviteFriends,
-            onTap: () => context.push(Routes.settingsInvite),
-          ),
-        ],
       ),
     );
   }

pubspec.lock

@@ -1204,7 +1204,7 @@ packages:
       path: "dependencies/libsignal_protocol_dart"
       relative: true
     source: path
-    version: "0.7.4"
+    version: "0.8.0"
   lints:
     dependency: transitive
     description:
@@ -1280,10 +1280,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
@@ -1339,13 +1339,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
-  no_screenshot:
-    dependency: "direct main"
-    description:
-      path: "dependencies/no_screenshot"
-      relative: true
-    source: path
-    version: "1.0.0"
   objective_c:
     dependency: transitive
     description:
@@ -1579,10 +1572,10 @@ packages:
     dependency: "direct main"
     description:
       name: protobuf
-      sha256: de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e
+      sha256: "75ec242d22e950bdcc79ee38dd520ce4ee0bc491d7fadc4ea47694604d22bf06"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "6.0.0"
   provider:
     dependency: "direct main"
     description:
@@ -1651,6 +1644,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+  screen_protector:
+    dependency: "direct main"
+    description:
+      path: "dependencies/screen_protector"
+      relative: true
+    source: path
+    version: "1.5.1"
   scrollable_positioned_list:
     dependency: "direct main"
     description:
@@ -1924,10 +1924,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.9"
+    version: "0.7.10"
   timezone:
     dependency: transitive
     description:

pubspec.yaml

@@ -3,7 +3,7 @@ description: "twonly, a privacy-friendly way to connect with friends through sec
 
 publish_to: 'none'
 
-version: 0.2.1+110
+version: 0.2.2+111
 
 environment:
   sdk: ^3.11.0
@@ -56,7 +56,7 @@ dependencies:
   firebase_messaging: ^16.1.0  # firebase.google.com
   firebase_app_installations: ^0.4.1 # firebase.google.com
   json_annotation: ^4.9.0 # google.dev
-  protobuf: ^4.0.0 # google.dev
+  protobuf: ^6.0.0 # google.dev
   scrollable_positioned_list: ^0.3.8 # google.dev
   drift: ^2.32.0
   drift_flutter: ^0.3.0
@@ -84,7 +84,7 @@ dependencies:
   qr_flutter: ^4.1.0
   hand_signature: ^3.0.3
   flutter_sharing_intent: ^2.0.4
-  no_screenshot: ^0.3.1
+  screen_protector: ^1.5.1
   flutter_markdown_plus: ^1.0.7
 
   # With high download. (But should be checked nonetheless.)
@@ -152,8 +152,8 @@ dependency_overrides:
     path: ./dependencies/x25519
   qr_flutter:
     path: ./dependencies/qr_flutter
-  no_screenshot:
+  screen_protector:
-    path: ./dependencies/no_screenshot
+    path: ./dependencies/screen_protector
   flutter_markdown_plus:
     path: ./dependencies/flutter_markdown_plus
   camera_android_camerax: