style: Format using dart format

lib/omemo_dart.dart

@@ -12,7 +12,6 @@ export 'src/omemo/events.dart';
 export 'src/omemo/fingerprint.dart';
 export 'src/omemo/omemomanager.dart';
 export 'src/omemo/ratchet_map_key.dart';
-export 'src/omemo/sessionmanager.dart';
 export 'src/omemo/stanza.dart';
 export 'src/trust/base.dart';
 export 'src/trust/btbv.dart';

lib/protobuf/schema.pb.dart

@@ -10,12 +10,35 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class OMEMOMessage extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'OMEMOMessage', createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-    ..a<$core.int>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'n', $pb.PbFieldType.QU3)
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-    ..a<$core.int>(2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'pn', $pb.PbFieldType.QU3)
+          ? ''
-    ..a<$core.List<$core.int>>(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'dhPub', $pb.PbFieldType.QY)
+          : 'OMEMOMessage',
-    ..a<$core.List<$core.int>>(4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'ciphertext', $pb.PbFieldType.OY)
+      createEmptyInstance: create)
-  ;
+    ..a<$core.int>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'n',
+        $pb.PbFieldType.QU3)
+    ..a<$core.int>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'pn',
+        $pb.PbFieldType.QU3)
+    ..a<$core.List<$core.int>>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'dhPub',
+        $pb.PbFieldType.QY)
+    ..a<$core.List<$core.int>>(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'ciphertext',
+        $pb.PbFieldType.OY);
 
   OMEMOMessage._() : super();
   factory OMEMOMessage({
@@ -39,31 +62,40 @@ class OMEMOMessage extends $pb.GeneratedMessage {
     }
     return _result;
   }
-  factory OMEMOMessage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory OMEMOMessage.fromBuffer($core.List<$core.int> i,
-  factory OMEMOMessage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-  @$core.Deprecated(
+      create()..mergeFromBuffer(i, r);
-  'Using this can add significant overhead to your binary. '
+  factory OMEMOMessage.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
   OMEMOMessage clone() => OMEMOMessage()..mergeFromMessage(this);
-  @$core.Deprecated(
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
-  'Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
       'Will be removed in next major version')
-  OMEMOMessage copyWith(void Function(OMEMOMessage) updates) => super.copyWith((message) => updates(message as OMEMOMessage)) as OMEMOMessage; // ignore: deprecated_member_use
+  OMEMOMessage copyWith(void Function(OMEMOMessage) updates) =>
+      super.copyWith((message) => updates(message as OMEMOMessage))
+          as OMEMOMessage; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static OMEMOMessage create() => OMEMOMessage._();
   OMEMOMessage createEmptyInstance() => create();
-  static $pb.PbList<OMEMOMessage> createRepeated() => $pb.PbList<OMEMOMessage>();
+  static $pb.PbList<OMEMOMessage> createRepeated() =>
+      $pb.PbList<OMEMOMessage>();
   @$core.pragma('dart2js:noInline')
-  static OMEMOMessage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OMEMOMessage>(create);
+  static OMEMOMessage getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<OMEMOMessage>(create);
   static OMEMOMessage? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get n => $_getIZ(0);
   @$pb.TagNumber(1)
-  set n($core.int v) { $_setUnsignedInt32(0, v); }
+  set n($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasN() => $_has(0);
   @$pb.TagNumber(1)
@@ -72,7 +104,10 @@ class OMEMOMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.int get pn => $_getIZ(1);
   @$pb.TagNumber(2)
-  set pn($core.int v) { $_setUnsignedInt32(1, v); }
+  set pn($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasPn() => $_has(1);
   @$pb.TagNumber(2)
@@ -81,7 +116,10 @@ class OMEMOMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.List<$core.int> get dhPub => $_getN(2);
   @$pb.TagNumber(3)
-  set dhPub($core.List<$core.int> v) { $_setBytes(2, v); }
+  set dhPub($core.List<$core.int> v) {
+    $_setBytes(2, v);
+  }
+
   @$pb.TagNumber(3)
   $core.bool hasDhPub() => $_has(2);
   @$pb.TagNumber(3)
@@ -90,7 +128,10 @@ class OMEMOMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.List<$core.int> get ciphertext => $_getN(3);
   @$pb.TagNumber(4)
-  set ciphertext($core.List<$core.int> v) { $_setBytes(3, v); }
+  set ciphertext($core.List<$core.int> v) {
+    $_setBytes(3, v);
+  }
+
   @$pb.TagNumber(4)
   $core.bool hasCiphertext() => $_has(3);
   @$pb.TagNumber(4)
@@ -98,10 +139,23 @@ class OMEMOMessage extends $pb.GeneratedMessage {
 }
 
 class OMEMOAuthenticatedMessage extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'OMEMOAuthenticatedMessage', createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-    ..a<$core.List<$core.int>>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'mac', $pb.PbFieldType.QY)
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-    ..a<$core.List<$core.int>>(2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'message', $pb.PbFieldType.QY)
+          ? ''
-  ;
+          : 'OMEMOAuthenticatedMessage',
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'mac',
+        $pb.PbFieldType.QY)
+    ..a<$core.List<$core.int>>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'message',
+        $pb.PbFieldType.QY);
 
   OMEMOAuthenticatedMessage._() : super();
   factory OMEMOAuthenticatedMessage({
@@ -117,31 +171,42 @@ class OMEMOAuthenticatedMessage extends $pb.GeneratedMessage {
     }
     return _result;
   }
-  factory OMEMOAuthenticatedMessage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory OMEMOAuthenticatedMessage.fromBuffer($core.List<$core.int> i,
-  factory OMEMOAuthenticatedMessage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-  @$core.Deprecated(
+      create()..mergeFromBuffer(i, r);
-  'Using this can add significant overhead to your binary. '
+  factory OMEMOAuthenticatedMessage.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
-  OMEMOAuthenticatedMessage clone() => OMEMOAuthenticatedMessage()..mergeFromMessage(this);
+  OMEMOAuthenticatedMessage clone() =>
-  @$core.Deprecated(
+      OMEMOAuthenticatedMessage()..mergeFromMessage(this);
-  'Using this can add significant overhead to your binary. '
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
       'Will be removed in next major version')
-  OMEMOAuthenticatedMessage copyWith(void Function(OMEMOAuthenticatedMessage) updates) => super.copyWith((message) => updates(message as OMEMOAuthenticatedMessage)) as OMEMOAuthenticatedMessage; // ignore: deprecated_member_use
+  OMEMOAuthenticatedMessage copyWith(
+          void Function(OMEMOAuthenticatedMessage) updates) =>
+      super.copyWith((message) => updates(message as OMEMOAuthenticatedMessage))
+          as OMEMOAuthenticatedMessage; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static OMEMOAuthenticatedMessage create() => OMEMOAuthenticatedMessage._();
   OMEMOAuthenticatedMessage createEmptyInstance() => create();
-  static $pb.PbList<OMEMOAuthenticatedMessage> createRepeated() => $pb.PbList<OMEMOAuthenticatedMessage>();
+  static $pb.PbList<OMEMOAuthenticatedMessage> createRepeated() =>
+      $pb.PbList<OMEMOAuthenticatedMessage>();
   @$core.pragma('dart2js:noInline')
-  static OMEMOAuthenticatedMessage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OMEMOAuthenticatedMessage>(create);
+  static OMEMOAuthenticatedMessage getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<OMEMOAuthenticatedMessage>(create);
   static OMEMOAuthenticatedMessage? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.List<$core.int> get mac => $_getN(0);
   @$pb.TagNumber(1)
-  set mac($core.List<$core.int> v) { $_setBytes(0, v); }
+  set mac($core.List<$core.int> v) {
+    $_setBytes(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasMac() => $_has(0);
   @$pb.TagNumber(1)
@@ -150,7 +215,10 @@ class OMEMOAuthenticatedMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.List<$core.int> get message => $_getN(1);
   @$pb.TagNumber(2)
-  set message($core.List<$core.int> v) { $_setBytes(1, v); }
+  set message($core.List<$core.int> v) {
+    $_setBytes(1, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasMessage() => $_has(1);
   @$pb.TagNumber(2)
@@ -158,13 +226,41 @@ class OMEMOAuthenticatedMessage extends $pb.GeneratedMessage {
 }
 
 class OMEMOKeyExchange extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'OMEMOKeyExchange', createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-    ..a<$core.int>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'pkId', $pb.PbFieldType.QU3)
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-    ..a<$core.int>(2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'spkId', $pb.PbFieldType.QU3)
+          ? ''
-    ..a<$core.List<$core.int>>(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'ik', $pb.PbFieldType.QY)
+          : 'OMEMOKeyExchange',
-    ..a<$core.List<$core.int>>(4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'ek', $pb.PbFieldType.QY)
+      createEmptyInstance: create)
-    ..aQM<OMEMOAuthenticatedMessage>(5, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'message', subBuilder: OMEMOAuthenticatedMessage.create)
+    ..a<$core.int>(
-  ;
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'pkId',
+        $pb.PbFieldType.QU3)
+    ..a<$core.int>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'spkId',
+        $pb.PbFieldType.QU3)
+    ..a<$core.List<$core.int>>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'ik',
+        $pb.PbFieldType.QY)
+    ..a<$core.List<$core.int>>(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'ek',
+        $pb.PbFieldType.QY)
+    ..aQM<OMEMOAuthenticatedMessage>(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'message',
+        subBuilder: OMEMOAuthenticatedMessage.create);
 
   OMEMOKeyExchange._() : super();
   factory OMEMOKeyExchange({
@@ -192,31 +288,40 @@ class OMEMOKeyExchange extends $pb.GeneratedMessage {
     }
     return _result;
   }
-  factory OMEMOKeyExchange.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory OMEMOKeyExchange.fromBuffer($core.List<$core.int> i,
-  factory OMEMOKeyExchange.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
-  @$core.Deprecated(
+      create()..mergeFromBuffer(i, r);
-  'Using this can add significant overhead to your binary. '
+  factory OMEMOKeyExchange.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
   OMEMOKeyExchange clone() => OMEMOKeyExchange()..mergeFromMessage(this);
-  @$core.Deprecated(
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
-  'Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
       'Will be removed in next major version')
-  OMEMOKeyExchange copyWith(void Function(OMEMOKeyExchange) updates) => super.copyWith((message) => updates(message as OMEMOKeyExchange)) as OMEMOKeyExchange; // ignore: deprecated_member_use
+  OMEMOKeyExchange copyWith(void Function(OMEMOKeyExchange) updates) =>
+      super.copyWith((message) => updates(message as OMEMOKeyExchange))
+          as OMEMOKeyExchange; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static OMEMOKeyExchange create() => OMEMOKeyExchange._();
   OMEMOKeyExchange createEmptyInstance() => create();
-  static $pb.PbList<OMEMOKeyExchange> createRepeated() => $pb.PbList<OMEMOKeyExchange>();
+  static $pb.PbList<OMEMOKeyExchange> createRepeated() =>
+      $pb.PbList<OMEMOKeyExchange>();
   @$core.pragma('dart2js:noInline')
-  static OMEMOKeyExchange getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<OMEMOKeyExchange>(create);
+  static OMEMOKeyExchange getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<OMEMOKeyExchange>(create);
   static OMEMOKeyExchange? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get pkId => $_getIZ(0);
   @$pb.TagNumber(1)
-  set pkId($core.int v) { $_setUnsignedInt32(0, v); }
+  set pkId($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasPkId() => $_has(0);
   @$pb.TagNumber(1)
@@ -225,7 +330,10 @@ class OMEMOKeyExchange extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.int get spkId => $_getIZ(1);
   @$pb.TagNumber(2)
-  set spkId($core.int v) { $_setUnsignedInt32(1, v); }
+  set spkId($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasSpkId() => $_has(1);
   @$pb.TagNumber(2)
@@ -234,7 +342,10 @@ class OMEMOKeyExchange extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.List<$core.int> get ik => $_getN(2);
   @$pb.TagNumber(3)
-  set ik($core.List<$core.int> v) { $_setBytes(2, v); }
+  set ik($core.List<$core.int> v) {
+    $_setBytes(2, v);
+  }
+
   @$pb.TagNumber(3)
   $core.bool hasIk() => $_has(2);
   @$pb.TagNumber(3)
@@ -243,7 +354,10 @@ class OMEMOKeyExchange extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.List<$core.int> get ek => $_getN(3);
   @$pb.TagNumber(4)
-  set ek($core.List<$core.int> v) { $_setBytes(3, v); }
+  set ek($core.List<$core.int> v) {
+    $_setBytes(3, v);
+  }
+
   @$pb.TagNumber(4)
   $core.bool hasEk() => $_has(3);
   @$pb.TagNumber(4)
@@ -252,7 +366,10 @@ class OMEMOKeyExchange extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   OMEMOAuthenticatedMessage get message => $_getN(4);
   @$pb.TagNumber(5)
-  set message(OMEMOAuthenticatedMessage v) { setField(5, v); }
+  set message(OMEMOAuthenticatedMessage v) {
+    setField(5, v);
+  }
+
   @$pb.TagNumber(5)
   $core.bool hasMessage() => $_has(4);
   @$pb.TagNumber(5)
@@ -260,4 +377,3 @@ class OMEMOKeyExchange extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   OMEMOAuthenticatedMessage ensureMessage() => $_ensure(4);
 }
-

lib/protobuf/schema.pbenum.dart

@@ -4,4 +4,3 @@
 //
 // @dart = 2.12
 // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
-

lib/protobuf/schema.pbjson.dart

@@ -8,41 +8,53 @@
 import 'dart:core' as $core;
 import 'dart:convert' as $convert;
 import 'dart:typed_data' as $typed_data;
+
 @$core.Deprecated('Use oMEMOMessageDescriptor instead')
-const OMEMOMessage$json = const {
+const OMEMOMessage$json = {
   '1': 'OMEMOMessage',
-  '2': const [
+  '2': [
-    const {'1': 'n', '3': 1, '4': 2, '5': 13, '10': 'n'},
+    {'1': 'n', '3': 1, '4': 2, '5': 13, '10': 'n'},
-    const {'1': 'pn', '3': 2, '4': 2, '5': 13, '10': 'pn'},
+    {'1': 'pn', '3': 2, '4': 2, '5': 13, '10': 'pn'},
-    const {'1': 'dh_pub', '3': 3, '4': 2, '5': 12, '10': 'dhPub'},
+    {'1': 'dh_pub', '3': 3, '4': 2, '5': 12, '10': 'dhPub'},
-    const {'1': 'ciphertext', '3': 4, '4': 1, '5': 12, '10': 'ciphertext'},
+    {'1': 'ciphertext', '3': 4, '4': 1, '5': 12, '10': 'ciphertext'},
   ],
 };
 
 /// Descriptor for `OMEMOMessage`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List oMEMOMessageDescriptor = $convert.base64Decode('CgxPTUVNT01lc3NhZ2USDAoBbhgBIAIoDVIBbhIOCgJwbhgCIAIoDVICcG4SFQoGZGhfcHViGAMgAigMUgVkaFB1YhIeCgpjaXBoZXJ0ZXh0GAQgASgMUgpjaXBoZXJ0ZXh0');
+final $typed_data.Uint8List oMEMOMessageDescriptor = $convert.base64Decode(
+    'CgxPTUVNT01lc3NhZ2USDAoBbhgBIAIoDVIBbhIOCgJwbhgCIAIoDVICcG4SFQoGZGhfcHViGAMgAigMUgVkaFB1YhIeCgpjaXBoZXJ0ZXh0GAQgASgMUgpjaXBoZXJ0ZXh0');
 @$core.Deprecated('Use oMEMOAuthenticatedMessageDescriptor instead')
-const OMEMOAuthenticatedMessage$json = const {
+const OMEMOAuthenticatedMessage$json = {
   '1': 'OMEMOAuthenticatedMessage',
-  '2': const [
+  '2': [
-    const {'1': 'mac', '3': 1, '4': 2, '5': 12, '10': 'mac'},
+    {'1': 'mac', '3': 1, '4': 2, '5': 12, '10': 'mac'},
-    const {'1': 'message', '3': 2, '4': 2, '5': 12, '10': 'message'},
+    {'1': 'message', '3': 2, '4': 2, '5': 12, '10': 'message'},
   ],
 };
 
 /// Descriptor for `OMEMOAuthenticatedMessage`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List oMEMOAuthenticatedMessageDescriptor = $convert.base64Decode('ChlPTUVNT0F1dGhlbnRpY2F0ZWRNZXNzYWdlEhAKA21hYxgBIAIoDFIDbWFjEhgKB21lc3NhZ2UYAiACKAxSB21lc3NhZ2U=');
+final $typed_data.Uint8List oMEMOAuthenticatedMessageDescriptor =
+    $convert.base64Decode(
+        'ChlPTUVNT0F1dGhlbnRpY2F0ZWRNZXNzYWdlEhAKA21hYxgBIAIoDFIDbWFjEhgKB21lc3NhZ2UYAiACKAxSB21lc3NhZ2U=');
 @$core.Deprecated('Use oMEMOKeyExchangeDescriptor instead')
-const OMEMOKeyExchange$json = const {
+const OMEMOKeyExchange$json = {
   '1': 'OMEMOKeyExchange',
-  '2': const [
+  '2': [
-    const {'1': 'pk_id', '3': 1, '4': 2, '5': 13, '10': 'pkId'},
+    {'1': 'pk_id', '3': 1, '4': 2, '5': 13, '10': 'pkId'},
-    const {'1': 'spk_id', '3': 2, '4': 2, '5': 13, '10': 'spkId'},
+    {'1': 'spk_id', '3': 2, '4': 2, '5': 13, '10': 'spkId'},
-    const {'1': 'ik', '3': 3, '4': 2, '5': 12, '10': 'ik'},
+    {'1': 'ik', '3': 3, '4': 2, '5': 12, '10': 'ik'},
-    const {'1': 'ek', '3': 4, '4': 2, '5': 12, '10': 'ek'},
+    {'1': 'ek', '3': 4, '4': 2, '5': 12, '10': 'ek'},
-    const {'1': 'message', '3': 5, '4': 2, '5': 11, '6': '.OMEMOAuthenticatedMessage', '10': 'message'},
+    {
+      '1': 'message',
+      '3': 5,
+      '4': 2,
+      '5': 11,
+      '6': '.OMEMOAuthenticatedMessage',
+      '10': 'message'
+    },
   ],
 };
 
 /// Descriptor for `OMEMOKeyExchange`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List oMEMOKeyExchangeDescriptor = $convert.base64Decode('ChBPTUVNT0tleUV4Y2hhbmdlEhMKBXBrX2lkGAEgAigNUgRwa0lkEhUKBnNwa19pZBgCIAIoDVIFc3BrSWQSDgoCaWsYAyACKAxSAmlrEg4KAmVrGAQgAigMUgJlaxI0CgdtZXNzYWdlGAUgAigLMhouT01FTU9BdXRoZW50aWNhdGVkTWVzc2FnZVIHbWVzc2FnZQ==');
+final $typed_data.Uint8List oMEMOKeyExchangeDescriptor = $convert.base64Decode(
+    'ChBPTUVNT0tleUV4Y2hhbmdlEhMKBXBrX2lkGAEgAigNUgRwa0lkEhUKBnNwa19pZBgCIAIoDVIFc3BrSWQSDgoCaWsYAyACKAxSAmlrEg4KAmVrGAQgAigMUgJlaxI0CgdtZXNzYWdlGAUgAigLMhouT01FTU9BdXRoZW50aWNhdGVkTWVzc2FnZVIHbWVzc2FnZQ==');

lib/protobuf/schema.pbserver.dart

@@ -6,4 +6,3 @@
 // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
 export 'schema.pb.dart';
-

lib/src/crypto.dart

@@ -6,7 +6,8 @@ import 'package:omemo_dart/src/keys.dart';
 /// it indicates which of [kp] ([identityKey] == 1) or [pk] ([identityKey] == 2)
 /// is the identity key. This is needed since the identity key pair/public key is
 /// an Ed25519 key, but we need them as X25519 keys for DH.
-Future<List<int>> omemoDH(OmemoKeyPair kp, OmemoPublicKey pk, int identityKey) async {
+Future<List<int>> omemoDH(
+    OmemoKeyPair kp, OmemoPublicKey pk, int identityKey,) async {
   var ckp = kp;
   var cpk = pk;
 
@@ -25,7 +26,6 @@ Future<List<int>> omemoDH(OmemoKeyPair kp, OmemoPublicKey pk, int identityKey) a
 }
 
 class HkdfKeyResult {
-
   const HkdfKeyResult(this.encryptionKey, this.authenticationKey, this.iv);
   final List<int> encryptionKey;
   final List<int> authenticationKey;
@@ -35,7 +35,8 @@ class HkdfKeyResult {
 /// cryptography _really_ wants to check the MAC output from AES-256-CBC. Since
 /// we don't have it, we need the MAC check to always "pass".
 class NoMacSecretBox extends SecretBox {
-  NoMacSecretBox(super.cipherText, { required super.nonce }) : super(mac: Mac.empty);
+  NoMacSecretBox(super.cipherText, {required super.nonce})
+      : super(mac: Mac.empty);
 
   @override
   Future<void> checkMac({
@@ -60,12 +61,14 @@ Future<HkdfKeyResult> deriveEncryptionKeys(List<int> input, String info) async {
   );
   final bytes = await result.extractBytes();
 
-  return HkdfKeyResult(bytes.sublist(0, 32), bytes.sublist(32, 64), bytes.sublist(64, 80));
+  return HkdfKeyResult(
+      bytes.sublist(0, 32), bytes.sublist(32, 64), bytes.sublist(64, 80),);
 }
 
 /// A small helper function to make AES-256-CBC easier. Encrypt [plaintext] using [key] as
 /// the encryption key and [iv] as the IV. Returns the ciphertext.
-Future<List<int>> aes256CbcEncrypt(List<int> plaintext, List<int> key, List<int> iv) async {
+Future<List<int>> aes256CbcEncrypt(
+    List<int> plaintext, List<int> key, List<int> iv,) async {
   final algorithm = AesCbc.with256bits(
     macAlgorithm: MacAlgorithm.empty,
   );
@@ -80,7 +83,8 @@ Future<List<int>> aes256CbcEncrypt(List<int> plaintext, List<int> key, List<int>
 
 /// A small helper function to make AES-256-CBC easier. Decrypt [ciphertext] using [key] as
 /// the encryption key and [iv] as the IV. Returns the ciphertext.
-Future<List<int>> aes256CbcDecrypt(List<int> ciphertext, List<int> key, List<int> iv) async {
+Future<List<int>> aes256CbcDecrypt(
+    List<int> ciphertext, List<int> key, List<int> iv,) async {
   final algorithm = AesCbc.with256bits(
     macAlgorithm: MacAlgorithm.empty,
   );

lib/src/double_ratchet/crypto.dart

@@ -10,12 +10,15 @@ const encryptHkdfInfoString = 'OMEMO Message Key Material';
 /// Signals ENCRYPT function as specified by OMEMO 0.8.3.
 /// Encrypt [plaintext] using the message key [mk], given associated_data [associatedData]
 /// and the AD output from the X3DH [sessionAd].
-Future<List<int>> encrypt(List<int> mk, List<int> plaintext, List<int> associatedData, List<int> sessionAd) async {
+Future<List<int>> encrypt(List<int> mk, List<int> plaintext,
+    List<int> associatedData, List<int> sessionAd,) async {
   // Generate encryption, authentication key and IV
   final keys = await deriveEncryptionKeys(mk, encryptHkdfInfoString);
-  final ciphertext = await aes256CbcEncrypt(plaintext, keys.encryptionKey, keys.iv);
+  final ciphertext =
+      await aes256CbcEncrypt(plaintext, keys.encryptionKey, keys.iv);
 
-  final header = OmemoMessage.fromBuffer(associatedData.sublist(sessionAd.length))
+  final header =
+      OmemoMessage.fromBuffer(associatedData.sublist(sessionAd.length))
         ..ciphertext = ciphertext;
   final headerBytes = header.writeToBuffer();
   final hmacInput = concat([sessionAd, headerBytes]);
@@ -29,7 +32,8 @@ Future<List<int>> encrypt(List<int> mk, List<int> plaintext, List<int> associate
 /// Signals DECRYPT function as specified by OMEMO 0.8.3.
 /// Decrypt [ciphertext] with the message key [mk], given the associated_data [associatedData]
 /// and the AD output from the X3DH.
-Future<List<int>> decrypt(List<int> mk, List<int> ciphertext, List<int> associatedData, List<int> sessionAd) async {
+Future<List<int>> decrypt(List<int> mk, List<int> ciphertext,
+    List<int> associatedData, List<int> sessionAd,) async {
   // Generate encryption, authentication key and IV
   final keys = await deriveEncryptionKeys(mk, encryptHkdfInfoString);
 

lib/src/double_ratchet/double_ratchet.dart

@@ -99,7 +99,8 @@ class OmemoDoubleRatchet {
     // NOTE: Dart has some issues with just casting a List<dynamic> to List<Map<...>>, as
     //       such we need to convert the items by hand.
     final mkSkipped = Map<SkippedKey, List<int>>.fromEntries(
-      (data['mkskipped']! as List<dynamic>).map<MapEntry<SkippedKey, List<int>>>(
+      (data['mkskipped']! as List<dynamic>)
+          .map<MapEntry<SkippedKey, List<int>>>(
         (entry) {
           final map = entry as Map<String, dynamic>;
           final key = SkippedKey.fromJson(map);
@@ -178,7 +179,8 @@ class OmemoDoubleRatchet {
   /// Create an OMEMO session using the Signed Pre Key [spk], the shared secret [sk] that
   /// was obtained using a X3DH and the associated data [ad] that was also obtained through
   /// a X3DH. [ik] refers to Bob's (the receiver's) IK public key.
-  static Future<OmemoDoubleRatchet> initiateNewSession(OmemoPublicKey spk, OmemoPublicKey ik, List<int> sk, List<int> ad, int timestamp) async {
+  static Future<OmemoDoubleRatchet> initiateNewSession(OmemoPublicKey spk,
+      OmemoPublicKey ik, List<int> sk, List<int> ad, int timestamp,) async {
     final dhs = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
     final dhr = spk;
     final rk = await kdfRk(sk, await omemoDH(dhs, dhr, 0));
@@ -206,7 +208,8 @@ class OmemoDoubleRatchet {
   /// Pre Key keypair [spk], the shared secret [sk] that was obtained through a X3DH and
   /// the associated data [ad] that was also obtained through a X3DH. [ik] refers to
   /// Alice's (the initiator's) IK public key.
-  static Future<OmemoDoubleRatchet> acceptNewSession(OmemoKeyPair spk, OmemoPublicKey ik, List<int> sk, List<int> ad, int kexTimestamp) async {
+  static Future<OmemoDoubleRatchet> acceptNewSession(OmemoKeyPair spk,
+      OmemoPublicKey ik, List<int> sk, List<int> ad, int kexTimestamp,) async {
     return OmemoDoubleRatchet(
       spk,
       null,
@@ -226,7 +229,8 @@ class OmemoDoubleRatchet {
   }
 
   Future<Map<String, dynamic>> toJson() async {
-    final mkSkippedSerialised = List<Map<String, dynamic>>.empty(growable: true);
+    final mkSkippedSerialised =
+        List<Map<String, dynamic>>.empty(growable: true);
     for (final entry in mkSkipped.entries) {
       final result = await entry.key.toJson();
       result['key'] = base64.encode(entry.value);
@@ -259,7 +263,8 @@ class OmemoDoubleRatchet {
     return HEX.encode(await curveKey.getBytes());
   }
 
-  Future<List<int>?> _trySkippedMessageKeys(OmemoMessage header, List<int> ciphertext) async {
+  Future<List<int>?> _trySkippedMessageKeys(
+      OmemoMessage header, List<int> ciphertext,) async {
     final key = SkippedKey(
       OmemoPublicKey.fromBytes(header.dhPub!, KeyPairType.x25519),
       header.n!,
@@ -268,7 +273,8 @@ class OmemoDoubleRatchet {
       final mk = mkSkipped[key]!;
       mkSkipped.remove(key);
 
-      return decrypt(mk, ciphertext, concat([sessionAd, header.writeToBuffer()]), sessionAd);
+      return decrypt(mk, ciphertext,
+          concat([sessionAd, header.writeToBuffer()]), sessionAd,);
     }
 
     return null;
@@ -320,7 +326,8 @@ class OmemoDoubleRatchet {
 
     return RatchetStep(
       header,
-      await encrypt(mk, plaintext, concat([sessionAd, header.writeToBuffer()]), sessionAd),
+      await encrypt(mk, plaintext, concat([sessionAd, header.writeToBuffer()]),
+          sessionAd,),
     );
   }
 
@@ -328,7 +335,8 @@ class OmemoDoubleRatchet {
   /// Ratchet. Returns the decrypted (raw) plaintext.
   ///
   /// Throws an SkippingTooManyMessagesException if too many messages were to be skipped.
-  Future<List<int>> ratchetDecrypt(OmemoMessage header, List<int> ciphertext) async {
+  Future<List<int>> ratchetDecrypt(
+      OmemoMessage header, List<int> ciphertext,) async {
     // Check if we skipped too many messages
     final plaintext = await _trySkippedMessageKeys(header, ciphertext);
     if (plaintext != null) {
@@ -350,7 +358,8 @@ class OmemoDoubleRatchet {
     ckr = newCkr;
     nr++;
 
-    return decrypt(mk, ciphertext, concat([sessionAd, header.writeToBuffer()]), sessionAd);
+    return decrypt(
+        mk, ciphertext, concat([sessionAd, header.writeToBuffer()]), sessionAd,);
   }
 
   OmemoDoubleRatchet clone() {
@@ -358,12 +367,8 @@ class OmemoDoubleRatchet {
       dhs,
       dhr,
       rk,
-      cks != null ?
+      cks != null ? List<int>.from(cks!) : null,
-        List<int>.from(cks!) :
+      ckr != null ? List<int>.from(ckr!) : null,
-        null,
-      ckr != null ?
-        List<int>.from(ckr!) :
-        null,
       ns,
       nr,
       pn,
@@ -381,12 +386,8 @@ class OmemoDoubleRatchet {
       dhs,
       dhr,
       rk,
-      cks != null ?
+      cks != null ? List<int>.from(cks!) : null,
-        List<int>.from(cks!) :
+      ckr != null ? List<int>.from(ckr!) : null,
-        null,
-      ckr != null ?
-        List<int>.from(ckr!) :
-        null,
       ns,
       nr,
       pn,
@@ -401,16 +402,17 @@ class OmemoDoubleRatchet {
 
   @visibleForTesting
   Future<bool> equals(OmemoDoubleRatchet other) async {
-    final dhrMatch = dhr == null ?
+    final dhrMatch = dhr == null
-      other.dhr == null :
+        ? other.dhr == null
+        :
         // ignore: invalid_use_of_visible_for_testing_member
         other.dhr != null && await dhr!.equals(other.dhr!);
-    final ckrMatch = ckr == null ?
+    final ckrMatch = ckr == null
-      other.ckr == null :
+        ? other.ckr == null
-      other.ckr != null && listsEqual(ckr!, other.ckr!);
+        : other.ckr != null && listsEqual(ckr!, other.ckr!);
-    final cksMatch = cks == null ?
+    final cksMatch = cks == null
-      other.cks == null :
+        ? other.cks == null
-      other.cks != null && listsEqual(cks!, other.cks!);
+        : other.cks != null && listsEqual(cks!, other.cks!);
 
     // ignore: invalid_use_of_visible_for_testing_member
     final dhsMatch = await dhs.equals(other.dhs);

lib/src/errors.dart

@@ -2,8 +2,10 @@ abstract class OmemoException {}
 
 /// Triggered during X3DH if the signature if the SPK does verify to the actual SPK.
 class InvalidSignatureException extends OmemoException implements Exception {
-  String errMsg() => 'The signature of the SPK does not match the provided signature';
+  String errMsg() =>
+      'The signature of the SPK does not match the provided signature';
 }
+
 /// Triggered by the Double Ratchet if the computed HMAC does not match the attached HMAC.
 /// Triggered by the Session Manager if the computed HMAC does not match the attached HMAC.
 class InvalidMessageHMACException extends OmemoException implements Exception {
@@ -12,12 +14,14 @@ class InvalidMessageHMACException extends OmemoException implements Exception {
 
 /// Triggered by the Double Ratchet if skipping messages would cause skipping more than
 /// MAXSKIP messages
-class SkippingTooManyMessagesException extends OmemoException implements Exception {
+class SkippingTooManyMessagesException extends OmemoException
+    implements Exception {
   String errMsg() => 'Skipping messages would cause a skip bigger than MAXSKIP';
 }
 
 /// Triggered by the Session Manager if the message key is not encrypted for the device.
-class NotEncryptedForDeviceException extends OmemoException implements Exception {
+class NotEncryptedForDeviceException extends OmemoException
+    implements Exception {
   String errMsg() => 'Not encrypted for this device';
 }
 
@@ -41,7 +45,8 @@ class InvalidKeyExchangeException extends OmemoException implements Exception {
 
 /// Triggered by the Session Manager when a message's sequence number is smaller than we
 /// expect it to be.
-class MessageAlreadyDecryptedException extends OmemoException implements Exception {
+class MessageAlreadyDecryptedException extends OmemoException
+    implements Exception {
   String errMsg() => 'The message has already been decrypted';
 }
 
@@ -49,6 +54,8 @@ class MessageAlreadyDecryptedException extends OmemoException implements Excepti
 /// no key material available. That happens, for example, when we want to create a
 /// ratchet session with a JID we had no session with but fetching the device bundle
 /// failed.
-class NoKeyMaterialAvailableException extends OmemoException implements Exception {
+class NoKeyMaterialAvailableException extends OmemoException
-  String errMsg() => 'No key material available to create a ratchet session with';
+    implements Exception {
+  String errMsg() =>
+      'No key material available to create a ratchet session with';
 }

lib/src/helpers.dart

@@ -43,7 +43,8 @@ int generateRandom32BitNumber() {
   return Random.secure().nextInt(4294967295 /*pow(2, 32) - 1*/);
 }
 
-OmemoPublicKey? decodeKeyIfNotNull(Map<String, dynamic> map, String key, KeyPairType type) {
+OmemoPublicKey? decodeKeyIfNotNull(
+    Map<String, dynamic> map, String key, KeyPairType type,) {
   if (map[key] == null) return null;
 
   return OmemoPublicKey.fromBytes(

lib/src/keys.dart

@@ -31,7 +31,8 @@ class OmemoPublicKey {
   Future<String> asBase64() async => base64Encode(_pubkey.bytes);
 
   Future<OmemoPublicKey> toCurve25519() async {
-    assert(type == KeyPairType.ed25519, 'Cannot convert non-Ed25519 public key to X25519');
+    assert(type == KeyPairType.ed25519,
+        'Cannot convert non-Ed25519 public key to X25519',);
 
     final pkc = Uint8List(publicKeyLength);
     TweetNaClExt.crypto_sign_ed25519_pk_to_x25519_pk(
@@ -39,14 +40,16 @@ class OmemoPublicKey {
       Uint8List.fromList(await getBytes()),
     );
 
-    return OmemoPublicKey(SimplePublicKey(List<int>.from(pkc), type: KeyPairType.x25519));
+    return OmemoPublicKey(
+        SimplePublicKey(List<int>.from(pkc), type: KeyPairType.x25519),);
   }
 
   SimplePublicKey asPublicKey() => _pubkey;
 
   @visibleForTesting
   Future<bool> equals(OmemoPublicKey key) async {
-    return type == key.type && listsEqual(
+    return type == key.type &&
+        listsEqual(
           await getBytes(),
           await key.getBytes(),
         );
@@ -61,7 +64,8 @@ class OmemoPrivateKey {
   Future<List<int>> getBytes() async => _privkey;
 
   Future<OmemoPrivateKey> toCurve25519() async {
-    assert(type == KeyPairType.ed25519, 'Cannot convert non-Ed25519 private key to X25519');
+    assert(type == KeyPairType.ed25519,
+        'Cannot convert non-Ed25519 private key to X25519',);
 
     final skc = Uint8List(privateKeyLength);
     TweetNaClExt.crypto_sign_ed25519_sk_to_x25519_sk(
@@ -74,7 +78,8 @@ class OmemoPrivateKey {
 
   @visibleForTesting
   Future<bool> equals(OmemoPrivateKey key) async {
-    return type == key.type && listsEqual(
+    return type == key.type &&
+        listsEqual(
           await getBytes(),
           await key.getBytes(),
         );
@@ -87,7 +92,8 @@ class OmemoKeyPair {
 
   /// Create an OmemoKeyPair just from a [type] and the bytes of the private and public
   /// key.
-  factory OmemoKeyPair.fromBytes(List<int> publicKey, List<int> privateKey, KeyPairType type) {
+  factory OmemoKeyPair.fromBytes(
+      List<int> publicKey, List<int> privateKey, KeyPairType type,) {
     return OmemoKeyPair(
       OmemoPublicKey.fromBytes(
         publicKey,
@@ -104,7 +110,8 @@ class OmemoKeyPair {
   /// Generate a completely new random OmemoKeyPair of type [type]. [type] must be either
   /// KeyPairType.ed25519 or KeyPairType.x25519.
   static Future<OmemoKeyPair> generateNewPair(KeyPairType type) async {
-    assert(type == KeyPairType.ed25519 || type == KeyPairType.x25519, 'Keypair must be either Ed25519 or X25519');
+    assert(type == KeyPairType.ed25519 || type == KeyPairType.x25519,
+        'Keypair must be either Ed25519 or X25519',);
 
     SimpleKeyPair kp;
     if (type == KeyPairType.ed25519) {
@@ -133,7 +140,8 @@ class OmemoKeyPair {
 
   /// Return the bytes that comprise the public key.
   Future<OmemoKeyPair> toCurve25519() async {
-    assert(type == KeyPairType.ed25519, 'Cannot convert non-Ed25519 keypair to X25519');
+    assert(type == KeyPairType.ed25519,
+        'Cannot convert non-Ed25519 keypair to X25519',);
 
     return OmemoKeyPair(
       await pk.toCurve25519(),

lib/src/omemo/bundle.dart

@@ -4,7 +4,6 @@ import 'package:hex/hex.dart';
 import 'package:omemo_dart/src/keys.dart';
 
 class OmemoBundle {
-
   const OmemoBundle(
     this.jid,
     this.id,
@@ -14,17 +13,23 @@ class OmemoBundle {
     this.ikEncoded,
     this.opksEncoded,
   );
+
   /// The bare Jid the Bundle belongs to
   final String jid;
+
   /// The device Id
   final int id;
+
   /// The SPK but base64 encoded
   final String spkEncoded;
   final int spkId;
+
   /// The SPK signature but base64 encoded
   final String spkSignatureEncoded;
+
   /// The IK but base64 encoded
   final String ikEncoded;
+
   /// The mapping of a OPK's id to the base64 encoded data
   final Map<int, String> opksEncoded;
 

lib/src/omemo/device.dart

@@ -93,7 +93,8 @@ class OmemoDevice {
   }
 
   /// Generate a completely new device, i.e. cryptographic identity.
-  static Future<OmemoDevice> generateNewDevice(String jid, { int opkAmount = 100 }) async {
+  static Future<OmemoDevice> generateNewDevice(String jid,
+      {int opkAmount = 100,}) async {
     final id = generateRandom32BitNumber();
     final ik = await OmemoKeyPair.generateNewPair(KeyPairType.ed25519);
     final spk = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
@@ -119,13 +120,16 @@ class OmemoDevice {
 
   /// The signed prekey...
   final OmemoKeyPair spk;
+
   /// ...its Id, ...
   final int spkId;
+
   /// ...and its signature
   final List<int> spkSignature;
 
   /// The old Signed Prekey...
   final OmemoKeyPair? oldSpk;
+
   /// ...and its Id
   final int? oldSpkId;
 
@@ -251,7 +255,9 @@ class OmemoDevice {
     } else {
       for (final entry in opks.entries) {
         // ignore: invalid_use_of_visible_for_testing_member
-        final matches = await other.opks[entry.key]?.equals(entry.value) ?? false;
+        final matches =
+            // ignore: invalid_use_of_visible_for_testing_member
+            await other.opks[entry.key]?.equals(entry.value) ?? false;
         if (!matches) {
           opksMatch = false;
         }
@@ -263,7 +269,10 @@ class OmemoDevice {
     // ignore: invalid_use_of_visible_for_testing_member
     final spkMatch = await spk.equals(other.spk);
     // ignore: invalid_use_of_visible_for_testing_member
-    final oldSpkMatch = oldSpk != null ? await oldSpk!.equals(other.oldSpk!) : other.oldSpk == null;
+    final oldSpkMatch = oldSpk != null
+        // ignore: invalid_use_of_visible_for_testing_member
+        ? await oldSpk!.equals(other.oldSpk!)
+        : other.oldSpk == null;
     return id == other.id &&
         ikMatch &&
         spkMatch &&

lib/src/omemo/encrypted_key.dart

@@ -4,7 +4,6 @@ import 'package:meta/meta.dart';
 /// <keys /> header.
 @immutable
 class EncryptedKey {
-
   const EncryptedKey(this.jid, this.rid, this.value, this.kex);
   final String jid;
   final int rid;

lib/src/omemo/encryption_result.dart

@@ -5,7 +5,8 @@ import 'package:omemo_dart/src/omemo/ratchet_map_key.dart';
 
 @immutable
 class EncryptionResult {
-  const EncryptionResult(this.ciphertext, this.encryptedKeys, this.deviceEncryptionErrors, this.jidEncryptionErrors);
+  const EncryptionResult(this.ciphertext, this.encryptedKeys,
+      this.deviceEncryptionErrors, this.jidEncryptionErrors,);
 
   /// The actual message that was encrypted.
   final List<int>? ciphertext;
@@ -22,5 +23,7 @@ class EncryptionResult {
 
   /// True if the encryption was a success. This means that we could encrypt for
   /// at least one ratchet.
-  bool isSuccess(int numberOfRecipients) => encryptedKeys.isNotEmpty && jidEncryptionErrors.length < numberOfRecipients;
+  bool isSuccess(int numberOfRecipients) =>
+      encryptedKeys.isNotEmpty &&
+      jidEncryptionErrors.length < numberOfRecipients;
 }

lib/src/omemo/events.dart

@@ -5,7 +5,8 @@ abstract class OmemoEvent {}
 
 /// Triggered when a ratchet has been modified
 class RatchetModifiedEvent extends OmemoEvent {
-  RatchetModifiedEvent(this.jid, this.deviceId, this.ratchet, this.added, this.replaced);
+  RatchetModifiedEvent(
+      this.jid, this.deviceId, this.ratchet, this.added, this.replaced,);
   final String jid;
   final int deviceId;
   final OmemoDoubleRatchet ratchet;

lib/src/omemo/omemomanager.dart

@@ -33,7 +33,8 @@ class _InternalDecryptionResult {
     this.ratchetCreated,
     this.ratchetReplaced,
     this.payload,
-  ) : assert(!ratchetCreated || !ratchetReplaced, 'Ratchet must be either replaced or created');
+  ) : assert(!ratchetCreated || !ratchetReplaced,
+            'Ratchet must be either replaced or created',);
   final bool ratchetCreated;
   final bool ratchetReplaced;
   final String? payload;
@@ -55,7 +56,8 @@ class OmemoManager {
 
   /// Send an empty OMEMO:2 message using the encrypted payload @result to
   /// @recipientJid.
-  final Future<void> Function(EncryptionResult result, String recipientJid) sendEmptyOmemoMessageImpl;
+  final Future<void> Function(EncryptionResult result, String recipientJid)
+      sendEmptyOmemoMessageImpl;
 
   /// Fetch the list of device ids associated with @jid. If the device list cannot be
   /// fetched, return null.
@@ -69,13 +71,17 @@ class OmemoManager {
 
   /// Map bare JID to its known devices
   Map<String, List<int>> _deviceList = {};
+
   /// Map bare JIDs to whether we already requested the device list once
   final Map<String, bool> _deviceListRequested = {};
+
   /// Map bare a ratchet key to its ratchet. Note that this is also locked by
   /// _ratchetCriticalSectionLock.
   Map<RatchetMapKey, OmemoDoubleRatchet> _ratchetMap = {};
+
   /// Map bare JID to whether we already tried to subscribe to the device list node.
   final Map<String, bool> _subscriptionMap = {};
+
   /// For preventing a race condition in encryption/decryption
   final Map<String, Queue<Completer<void>>> _ratchetCriticalSectionQueue = {};
   final Lock _ratchetCriticalSectionLock = Lock();
@@ -90,7 +96,8 @@ class OmemoManager {
   OmemoDevice _device;
 
   /// The event bus of the session manager
-  final StreamController<OmemoEvent> _eventStreamController = StreamController<OmemoEvent>.broadcast();
+  final StreamController<OmemoEvent> _eventStreamController =
+      StreamController<OmemoEvent>.broadcast();
   Stream<OmemoEvent> get eventStream => _eventStreamController.stream;
 
   /// Enter the critical section for performing cryptographic operations on the ratchets
@@ -124,7 +131,8 @@ class OmemoManager {
     });
   }
 
-  Future<String?> _decryptAndVerifyHmac(List<int>? ciphertext, List<int> keyAndHmac) async {
+  Future<String?> _decryptAndVerifyHmac(
+      List<int>? ciphertext, List<int> keyAndHmac,) async {
     // Empty OMEMO messages should just have the key decrypted and/or session set up.
     if (ciphertext == null) {
       return null;
@@ -133,13 +141,15 @@ class OmemoManager {
     final key = keyAndHmac.sublist(0, 32);
     final hmac = keyAndHmac.sublist(32, 48);
     final derivedKeys = await deriveEncryptionKeys(key, omemoPayloadInfoString);
-    final computedHmac = await truncatedHmac(ciphertext, derivedKeys.authenticationKey);
+    final computedHmac =
+        await truncatedHmac(ciphertext, derivedKeys.authenticationKey);
     if (!listsEqual(hmac, computedHmac)) {
       throw InvalidMessageHMACException();
     }
 
     return utf8.decode(
-      await aes256CbcDecrypt(ciphertext, derivedKeys.encryptionKey, derivedKeys.iv),
+      await aes256CbcDecrypt(
+          ciphertext, derivedKeys.encryptionKey, derivedKeys.iv,),
     );
   }
 
@@ -167,13 +177,15 @@ class OmemoManager {
     _ratchetMap[key] = ratchet;
 
     // Commit the ratchet
-    _eventStreamController.add(RatchetModifiedEvent(jid, deviceId, ratchet, true, false));
+    _eventStreamController
+        .add(RatchetModifiedEvent(jid, deviceId, ratchet, true, false));
   }
 
   /// Build a new session with the user at [jid] with the device [deviceId] using data
   /// from the key exchange [kex]. In case [kex] contains an unknown Signed Prekey
   /// identifier an UnknownSignedPrekeyException will be thrown.
-  Future<OmemoDoubleRatchet> _addSessionFromKeyExchange(String jid, int deviceId, OmemoKeyExchange kex) async {
+  Future<OmemoDoubleRatchet> _addSessionFromKeyExchange(
+      String jid, int deviceId, OmemoKeyExchange kex,) async {
     // Pick the correct SPK
     final device = await getDevice();
     OmemoKeyPair spk;
@@ -212,7 +224,8 @@ class OmemoManager {
   /// Create a ratchet session initiated by Alice to the user with Jid [jid] and the device
   /// [deviceId] from the bundle [bundle].
   @visibleForTesting
-  Future<OmemoKeyExchange> addSessionFromBundle(String jid, int deviceId, OmemoBundle bundle) async {
+  Future<OmemoKeyExchange> addSessionFromBundle(
+      String jid, int deviceId, OmemoBundle bundle,) async {
     final device = await getDevice();
     final kexResult = await x3dhFromBundle(
       bundle,
@@ -241,7 +254,8 @@ class OmemoManager {
   /// [mapKey] with [oldRatchet].
   /// NOTE: Must be called from within the ratchet critical section
   void _restoreRatchet(RatchetMapKey mapKey, OmemoDoubleRatchet oldRatchet) {
-    _log.finest('Restoring ratchet ${mapKey.jid}:${mapKey.deviceId} to ${oldRatchet.nr}');
+    _log.finest(
+        'Restoring ratchet ${mapKey.jid}:${mapKey.deviceId} to ${oldRatchet.nr}',);
     _ratchetMap[mapKey] = oldRatchet;
 
     // Commit the ratchet
@@ -268,7 +282,12 @@ class OmemoManager {
   /// element, then [ciphertext] must be set to null. In this case, this function
   /// will return null as there is no message to be decrypted. This, however, is used
   /// to set up sessions or advance the ratchets.
-  Future<_InternalDecryptionResult> _decryptMessage(List<int>? ciphertext, String senderJid, int senderDeviceId, List<EncryptedKey> keys, int timestamp) async {
+  Future<_InternalDecryptionResult> _decryptMessage(
+      List<int>? ciphertext,
+      String senderJid,
+      int senderDeviceId,
+      List<EncryptedKey> keys,
+      int timestamp,) async {
     // Try to find a session we can decrypt with.
     var device = await getDevice();
     final rawKey = keys.firstWhereOrNull((key) => key.rid == device.id);
@@ -292,17 +311,20 @@ class OmemoManager {
 
       // Guard against old key exchanges
       if (oldRatchet != null) {
-        _log.finest('KEX for existent ratchet ${ratchetKey.toJsonKey()}. ${oldRatchet.kexTimestamp} > $timestamp: ${oldRatchet.kexTimestamp > timestamp}');
+        _log.finest(
+            'KEX for existent ratchet ${ratchetKey.toJsonKey()}. ${oldRatchet.kexTimestamp} > $timestamp: ${oldRatchet.kexTimestamp > timestamp}',);
         if (oldRatchet.kexTimestamp > timestamp) {
           throw InvalidKeyExchangeException();
         }
       }
 
-      final r = await _addSessionFromKeyExchange(senderJid, senderDeviceId, kex);
+      final r =
+          await _addSessionFromKeyExchange(senderJid, senderDeviceId, kex);
 
       // Try to decrypt with the new ratchet r
       try {
-        keyAndHmac = await r.ratchetDecrypt(message, authMessage.writeToBuffer());
+        keyAndHmac =
+            await r.ratchetDecrypt(message, authMessage.writeToBuffer());
         final result = await _decryptAndVerifyHmac(ciphertext, keyAndHmac);
 
         // Add the new ratchet
@@ -352,7 +374,8 @@ class OmemoManager {
 
     try {
       if (rawKey.kex) {
-        keyAndHmac = await ratchet.ratchetDecrypt(message, authMessage.writeToBuffer());
+        keyAndHmac =
+            await ratchet.ratchetDecrypt(message, authMessage.writeToBuffer());
       } else {
         keyAndHmac = await ratchet.ratchetDecrypt(message, decodedRawKey);
       }
@@ -393,14 +416,14 @@ class OmemoManager {
   Future<List<OmemoBundle>> _fetchNewBundles(String jid) async {
     // Check if we already requested the device list for [jid]
     List<int> bundlesToFetch;
-    if (!_deviceListRequested.containsKey(jid) || !_deviceList.containsKey(jid)) {
+    if (!_deviceListRequested.containsKey(jid) ||
+        !_deviceList.containsKey(jid)) {
       // We don't have an up-to-date version of the device list
       final newDeviceList = await fetchDeviceListImpl(jid);
       if (newDeviceList == null) return [];
 
       _deviceList[jid] = newDeviceList;
-      bundlesToFetch = newDeviceList
+      bundlesToFetch = newDeviceList.where((id) {
-        .where((id) {
         return !_ratchetMap.containsKey(RatchetMapKey(jid, id)) ||
             _deviceList[jid]?.contains(id) == false;
       }).toList();
@@ -437,7 +460,8 @@ class OmemoManager {
   /// does not contain a <payload /> element. This means that the ciphertext attribute of
   /// the result will be null as well.
   /// NOTE: Must be called within the ratchet critical section
-  Future<EncryptionResult> _encryptToJids(List<String> jids, String? plaintext) async {
+  Future<EncryptionResult> _encryptToJids(
+      List<String> jids, String? plaintext,) async {
     final encryptedKeys = List<EncryptedKey>.empty(growable: true);
 
     var ciphertext = const <int>[];
@@ -498,11 +522,13 @@ class OmemoManager {
         var ratchet = _ratchetMap[ratchetKey];
         if (ratchet == null) {
           _log.severe('Ratchet ${ratchetKey.toJsonKey()} does not exist.');
-          deviceEncryptionErrors[ratchetKey] = NoKeyMaterialAvailableException();
+          deviceEncryptionErrors[ratchetKey] =
+              NoKeyMaterialAvailableException();
           continue;
         }
 
-        final ciphertext = (await ratchet.ratchetEncrypt(keyPayload)).ciphertext;
+        final ciphertext =
+            (await ratchet.ratchetEncrypt(keyPayload)).ciphertext;
 
         if (kex.containsKey(ratchetKey)) {
           // The ratchet did not exist
@@ -523,7 +549,8 @@ class OmemoManager {
         } else if (!ratchet.acknowledged) {
           // The ratchet exists but is not acked
           if (ratchet.kex != null) {
-            final oldKex = OmemoKeyExchange.fromBuffer(base64.decode(ratchet.kex!))
+            final oldKex =
+                OmemoKeyExchange.fromBuffer(base64.decode(ratchet.kex!))
                   ..message = OmemoAuthenticatedMessage.fromBuffer(ciphertext);
 
             encryptedKeys.add(
@@ -536,7 +563,8 @@ class OmemoManager {
             );
           } else {
             // The ratchet is not acked but we don't have the old key exchange
-            _log.warning('Ratchet for $jid:$deviceId is not acked but the kex attribute is null');
+            _log.warning(
+                'Ratchet for $jid:$deviceId is not acked but the kex attribute is null',);
             encryptedKeys.add(
               EncryptedKey(
                 jid,
@@ -559,13 +587,13 @@ class OmemoManager {
         }
 
         // Commit the ratchet
-        _eventStreamController.add(RatchetModifiedEvent(jid, deviceId, ratchet, false, false));
+        _eventStreamController
+            .add(RatchetModifiedEvent(jid, deviceId, ratchet, false, false));
       }
     }
 
     return EncryptionResult(
-      plaintext != null ?
+      plaintext != null ? ciphertext : null,
-        ciphertext : null,
       encryptedKeys,
       deviceEncryptionErrors,
       jidEncryptionErrors,
@@ -582,13 +610,12 @@ class OmemoManager {
       _subscriptionMap[stanza.bareSenderJid] = true;
     }
 
-    final ratchetKey = RatchetMapKey(stanza.bareSenderJid, stanza.senderDeviceId);
+    final ratchetKey =
+        RatchetMapKey(stanza.bareSenderJid, stanza.senderDeviceId);
     final _InternalDecryptionResult result;
     try {
       result = await _decryptMessage(
-        stanza.payload != null ?
+        stanza.payload != null ? base64.decode(stanza.payload!) : null,
-          base64.decode(stanza.payload!) :
-          null,
         stanza.bareSenderJid,
         stanza.senderDeviceId,
         stanza.keys,
@@ -604,7 +631,8 @@ class OmemoManager {
 
     // Check if the ratchet is acked
     final ratchet = getRatchet(ratchetKey);
-    assert(ratchet != null, 'We decrypted the message, so the ratchet must exist');
+    assert(
+        ratchet != null, 'We decrypted the message, so the ratchet must exist',);
 
     if (ratchet!.acknowledged) {
       // Ratchet is acknowledged
@@ -676,18 +704,20 @@ class OmemoManager {
   }
 
   /// Mark the ratchet for device [deviceId] from [jid] as acked.
-  Future<void> ratchetAcknowledged(String jid, int deviceId, { bool enterCriticalSection = true }) async {
+  Future<void> ratchetAcknowledged(String jid, int deviceId,
+      {bool enterCriticalSection = true,}) async {
     if (enterCriticalSection) await _enterRatchetCriticalSection(jid);
 
     final key = RatchetMapKey(jid, deviceId);
     if (_ratchetMap.containsKey(key)) {
-      final ratchet = _ratchetMap[key]!
+      final ratchet = _ratchetMap[key]!..acknowledged = true;
-        ..acknowledged = true;
 
       // Commit it
-      _eventStreamController.add(RatchetModifiedEvent(jid, deviceId, ratchet, false, false));
+      _eventStreamController
+          .add(RatchetModifiedEvent(jid, deviceId, ratchet, false, false));
     } else {
-      _log.severe('Attempted to acknowledge ratchet ${key.toJsonKey()}, even though it does not exist');
+      _log.severe(
+          'Attempted to acknowledge ratchet ${key.toJsonKey()}, even though it does not exist',);
     }
 
     if (enterCriticalSection) await _leaveRatchetCriticalSection(jid);
@@ -714,7 +744,8 @@ class OmemoManager {
   Future<OmemoBundle> getDeviceBundle() async => (await getDevice()).toBundle();
 
   /// Directly aquire the current device's fingerprint.
-  Future<String> getDeviceFingerprint() async => (await getDevice()).getFingerprint();
+  Future<String> getDeviceFingerprint() async =>
+      (await getDevice()).getFingerprint();
 
   /// Returns the fingerprints for all devices of [jid] that we have a session with.
   /// If there are not sessions with [jid], then returns null.
@@ -757,7 +788,8 @@ class OmemoManager {
     _eventStreamController.add(DeviceListModifiedEvent(_deviceList));
   }
 
-  void initialize(Map<RatchetMapKey, OmemoDoubleRatchet> ratchetMap, Map<String, List<int>> deviceList) {
+  void initialize(Map<RatchetMapKey, OmemoDoubleRatchet> ratchetMap,
+      Map<String, List<int>> deviceList,) {
     _deviceList = deviceList;
     _ratchetMap = ratchetMap;
   }

lib/src/omemo/ratchet_map_key.dart

@@ -23,7 +23,9 @@ class RatchetMapKey {
 
   @override
   bool operator ==(Object other) {
-    return other is RatchetMapKey && jid == other.jid && deviceId == other.deviceId;
+    return other is RatchetMapKey &&
+        jid == other.jid &&
+        deviceId == other.deviceId;
   }
 
   @override

lib/src/protobuf/omemo_authenticated_message.dart

@@ -2,7 +2,6 @@ import 'package:omemo_dart/src/helpers.dart';
 import 'package:omemo_dart/src/protobuf/protobuf.dart';
 
 class OmemoAuthenticatedMessage {
-
   OmemoAuthenticatedMessage();
 
   factory OmemoAuthenticatedMessage.fromBuffer(List<int> data) {

lib/src/protobuf/omemo_message.dart

@@ -2,7 +2,6 @@ import 'package:omemo_dart/src/helpers.dart';
 import 'package:omemo_dart/src/protobuf/protobuf.dart';
 
 class OmemoMessage {
-
   OmemoMessage();
 
   factory OmemoMessage.fromBuffer(List<int> data) {

lib/src/protobuf/protobuf.dart

@@ -13,7 +13,6 @@ int fieldId(int number, int type) {
 }
 
 class VarintDecode {
-
   const VarintDecode(this.n, this.length);
   final int n;
   final int length;

lib/src/trust/btbv.dart

@@ -15,18 +15,25 @@ enum BTBVTrustState {
 
 int _trustToInt(BTBVTrustState state) {
   switch (state) {
-    case BTBVTrustState.notTrusted: return 1;
+    case BTBVTrustState.notTrusted:
-    case BTBVTrustState.blindTrust: return 2;
+      return 1;
-    case BTBVTrustState.verified:   return 3;
+    case BTBVTrustState.blindTrust:
+      return 2;
+    case BTBVTrustState.verified:
+      return 3;
   }
 }
 
 BTBVTrustState _trustFromInt(int i) {
   switch (i) {
-    case 1: return BTBVTrustState.notTrusted;
+    case 1:
-    case 2: return BTBVTrustState.blindTrust;
+      return BTBVTrustState.notTrusted;
-    case 3: return BTBVTrustState.verified;
+    case 2:
-    default: return BTBVTrustState.notTrusted;
+      return BTBVTrustState.blindTrust;
+    case 3:
+      return BTBVTrustState.verified;
+    default:
+      return BTBVTrustState.notTrusted;
   }
 }
 
@@ -139,7 +146,8 @@ abstract class BlindTrustBeforeVerificationTrustManager extends TrustManager {
   }
 
   /// Sets the trust of [jid]'s device with identifier [deviceId] to [state].
-  Future<void> setDeviceTrust(String jid, int deviceId, BTBVTrustState state) async {
+  Future<void> setDeviceTrust(
+      String jid, int deviceId, BTBVTrustState state,) async {
     await _lock.synchronized(() async {
       trustCache[RatchetMapKey(jid, deviceId)] = state;
 
@@ -172,10 +180,14 @@ abstract class BlindTrustBeforeVerificationTrustManager extends TrustManager {
   Future<Map<String, dynamic>> toJson() async {
     return {
       'devices': devices,
-      'trust': trustCache.map((key, value) => MapEntry(
+      'trust': trustCache.map(
-        key.toJsonKey(), _trustToInt(value),
+        (key, value) => MapEntry(
-      ),),
+          key.toJsonKey(),
-      'enable': enablementCache.map((key, value) => MapEntry(key.toJsonKey(), value)),
+          _trustToInt(value),
+        ),
+      ),
+      'enable':
+          enablementCache.map((key, value) => MapEntry(key.toJsonKey(), value)),
     };
   }
 
@@ -192,8 +204,10 @@ abstract class BlindTrustBeforeVerificationTrustManager extends TrustManager {
 
   /// From a serialized version of a BTBV trust manager, extract the trust cache.
   /// NOTE: This is needed as Dart cannot just cast a List<dynamic> to List<int> and so on.
-  static Map<RatchetMapKey, BTBVTrustState> trustCacheFromJson(Map<String, dynamic> json) {
+  static Map<RatchetMapKey, BTBVTrustState> trustCacheFromJson(
-    return (json['trust']! as Map<String, dynamic>).map<RatchetMapKey, BTBVTrustState>(
+      Map<String, dynamic> json,) {
+    return (json['trust']! as Map<String, dynamic>)
+        .map<RatchetMapKey, BTBVTrustState>(
       (key, value) => MapEntry(
         RatchetMapKey.fromJsonKey(key),
         _trustFromInt(value as int),
@@ -203,7 +217,8 @@ abstract class BlindTrustBeforeVerificationTrustManager extends TrustManager {
 
   /// From a serialized version of a BTBV trust manager, extract the enable cache.
   /// NOTE: This is needed as Dart cannot just cast a List<dynamic> to List<int> and so on.
-  static Map<RatchetMapKey, bool> enableCacheFromJson(Map<String, dynamic> json) {
+  static Map<RatchetMapKey, bool> enableCacheFromJson(
+      Map<String, dynamic> json,) {
     return (json['enable']! as Map<String, dynamic>).map<RatchetMapKey, bool>(
       (key, value) => MapEntry(
         RatchetMapKey.fromJsonKey(key),
@@ -226,7 +241,8 @@ abstract class BlindTrustBeforeVerificationTrustManager extends TrustManager {
   Future<void> commitState();
 
   @visibleForTesting
-  BTBVTrustState getDeviceTrust(String jid, int deviceId) => trustCache[RatchetMapKey(jid, deviceId)]!;
+  BTBVTrustState getDeviceTrust(String jid, int deviceId) =>
+      trustCache[RatchetMapKey(jid, deviceId)]!;
 }
 
 /// A BTBV TrustManager that does not commit its state to persistent storage. Well suited

lib/src/x3dh/x3dh.dart

@@ -12,7 +12,6 @@ const omemoX3DHInfoString = 'OMEMO X3DH';
 
 /// Performed by Alice
 class X3DHAliceResult {
-
   const X3DHAliceResult(this.ek, this.sk, this.opkId, this.ad);
   final OmemoKeyPair ek;
   final List<int> sk;
@@ -22,7 +21,6 @@ class X3DHAliceResult {
 
 /// Received by Bob
 class X3DHMessage {
-
   const X3DHMessage(this.ik, this.ek, this.opkId);
   final OmemoPublicKey ik;
   final OmemoPublicKey ek;
@@ -30,7 +28,6 @@ class X3DHMessage {
 }
 
 class X3DHBobResult {
-
   const X3DHBobResult(this.sk, this.ad);
   final List<int> sk;
   final List<int> ad;
@@ -39,7 +36,8 @@ class X3DHBobResult {
 /// Sign [message] using the keypair [keyPair]. Note that [keyPair] must be
 /// a Ed25519 keypair.
 Future<List<int>> sig(OmemoKeyPair keyPair, List<int> message) async {
-  assert(keyPair.type == KeyPairType.ed25519, 'Signature keypair must be Ed25519');
+  assert(
+      keyPair.type == KeyPairType.ed25519, 'Signature keypair must be Ed25519',);
   final signature = await Ed25519().sign(
     message,
     keyPair: await keyPair.asKeyPair(),
@@ -70,7 +68,8 @@ Future<List<int>> kdf(List<int> km) async {
 
 /// Alice builds a session with Bob using his bundle [bundle] and Alice's identity key
 /// pair [ik].
-Future<X3DHAliceResult> x3dhFromBundle(OmemoBundle bundle, OmemoKeyPair ik) async {
+Future<X3DHAliceResult> x3dhFromBundle(
+    OmemoBundle bundle, OmemoKeyPair ik,) async {
   // Check the signature first
   final signatureValue = await Ed25519().verify(
     await bundle.spk.getBytes(),
@@ -108,7 +107,8 @@ Future<X3DHAliceResult> x3dhFromBundle(OmemoBundle bundle, OmemoKeyPair ik) asyn
 
 /// Bob builds the X3DH shared secret from the inital message [msg], the SPK [spk], the
 /// OPK [opk] that was selected by Alice and our IK [ik]. Returns the shared secret.
-Future<X3DHBobResult> x3dhFromInitialMessage(X3DHMessage msg, OmemoKeyPair spk, OmemoKeyPair opk, OmemoKeyPair ik) async {
+Future<X3DHBobResult> x3dhFromInitialMessage(X3DHMessage msg, OmemoKeyPair spk,
+    OmemoKeyPair opk, OmemoKeyPair ik,) async {
   final dh1 = await omemoDH(spk, msg.ik, 2);
   final dh2 = await omemoDH(ik, msg.ek, 1);
   final dh3 = await omemoDH(spk, msg.ek, 0);

test/double_ratchet_test.dart

@@ -76,7 +76,6 @@ void main() {
 
     print('X3DH key exchange done');
 
-
     // Alice and Bob now share sk as a common secret and ad
     // Build a session
     final alicesRatchet = await OmemoDoubleRatchet.initiateNewSession(
@@ -101,7 +100,8 @@ void main() {
 
       if (i.isEven) {
         // Alice encrypts a message
-        final aliceRatchetResult = await alicesRatchet.ratchetEncrypt(utf8.encode(messageText));
+        final aliceRatchetResult =
+            await alicesRatchet.ratchetEncrypt(utf8.encode(messageText));
         print('Alice sent the message');
 
         // Alice sends it to Bob
@@ -117,7 +117,8 @@ void main() {
         expect(utf8.encode(messageText), bobRatchetResult);
       } else {
         // Bob sends a message to Alice
-        final bobRatchetResult = await bobsRatchet.ratchetEncrypt(utf8.encode(messageText));
+        final bobRatchetResult =
+            await bobsRatchet.ratchetEncrypt(utf8.encode(messageText));
         print('Bob sent the message');
 
         // Bobs sends it to Alice

test/omemo_test.dart

@@ -35,9 +35,9 @@ void main() {
     expect(await device.ik.equals(newDevice.ik), true);
     expect(await device.spk.equals(newDevice.spk), true);
 
-    final oldSpkMatch = device.oldSpk != null ?
+    final oldSpkMatch = device.oldSpk != null
-      await device.oldSpk!.equals(newDevice.oldSpk!) :
+        ? await device.oldSpk!.equals(newDevice.oldSpk!)
-      newDevice.oldSpk == null;
+        : newDevice.oldSpk == null;
     expect(oldSpkMatch, true);
     expect(listsEqual(device.spkSignature, newDevice.spkSignature), true);
   });
@@ -107,8 +107,10 @@ void main() {
     );
 
     // Ratchets are acked
-    await aliceSession.ratchetAcknowledged(bobJid, await bobSession.getDeviceId());
+    await aliceSession.ratchetAcknowledged(
-    await bobSession.ratchetAcknowledged(aliceJid, await aliceSession.getDeviceId());
+        bobJid, await bobSession.getDeviceId());
+    await bobSession.ratchetAcknowledged(
+        aliceJid, await aliceSession.getDeviceId());
 
     // Bob responds to Alice
     const bobResponseText = 'Oh, hello Alice!';
@@ -131,7 +133,8 @@ void main() {
     expect(bobResponseText, aliceReceivedMessage);
   });
 
-  test('Test using OMEMO sessions with only two devices for the receiver', () async {
+  test('Test using OMEMO sessions with only two devices for the receiver',
+      () async {
     const aliceJid = 'alice@server.example';
     const bobJid = 'bob@other.server.example';
 
@@ -181,8 +184,10 @@ void main() {
     expect(messagePlaintext, bobMessage);
 
     // Ratchets are acked
-    await aliceSession.ratchetAcknowledged(bobJid, await bobSession.getDeviceId());
+    await aliceSession.ratchetAcknowledged(
-    await bobSession.ratchetAcknowledged(aliceJid, await aliceSession.getDeviceId());
+        bobJid, await bobSession.getDeviceId());
+    await bobSession.ratchetAcknowledged(
+        aliceJid, await aliceSession.getDeviceId());
 
     // Bob responds to Alice
     const bobResponseText = 'Oh, hello Alice!';
@@ -457,8 +462,10 @@ void main() {
     );
 
     // Ratchets are acked
-    await aliceSession.ratchetAcknowledged(bobJid, await bobSession.getDeviceId());
+    await aliceSession.ratchetAcknowledged(
-    await bobSession.ratchetAcknowledged(aliceJid, await aliceSession.getDeviceId());
+        bobJid, await bobSession.getDeviceId());
+    await bobSession.ratchetAcknowledged(
+        aliceJid, await aliceSession.getDeviceId());
 
     for (var i = 0; i < 100; i++) {
       final messageText = 'Test Message #$i';
@@ -597,7 +604,8 @@ void main() {
     // ...
 
     // Alice marks the ratchet as acknowledged
-    await aliceSession.ratchetAcknowledged(bobJid, await bobSession.getDeviceId());
+    await aliceSession.ratchetAcknowledged(
+        bobJid, await bobSession.getDeviceId());
     expect(
       (await aliceSession.getUnacknowledgedRatchets(bobJid))!.isEmpty,
       true,
@@ -726,7 +734,6 @@ void main() {
       msg2.encryptedKeys,
       getTimestamp(),
     );
-
   });
 
   test('Test receiving old messages including a KEX', () async {
@@ -768,8 +775,10 @@ void main() {
     );
 
     // Ratchets are acked
-    await aliceSession.ratchetAcknowledged(bobJid, await bobSession.getDeviceId());
+    await aliceSession.ratchetAcknowledged(
-    await bobSession.ratchetAcknowledged(aliceJid, await aliceSession.getDeviceId());
+        bobJid, await bobSession.getDeviceId());
+    await bobSession.ratchetAcknowledged(
+        aliceJid, await aliceSession.getDeviceId());
 
     // Bob responds
     final msg2 = await bobSession.encryptToJid(
@@ -838,7 +847,6 @@ void main() {
     expect(errorCounter, 100);
     expect(await ratchetPreError.equals(ratchetPostError), true);
 
-    
     final msg3 = await aliceSession.encryptToJid(
       bobJid,
       'Are you okay?',
@@ -903,8 +911,10 @@ void main() {
     );
 
     // Now the acks reach us
-    await aliceSession.ratchetAcknowledged(bobJid, await bobSession.getDeviceId());
+    await aliceSession.ratchetAcknowledged(
-    await bobSession.ratchetAcknowledged(aliceJid, await aliceSession.getDeviceId());
+        bobJid, await bobSession.getDeviceId());
+    await bobSession.ratchetAcknowledged(
+        aliceJid, await aliceSession.getDeviceId());
 
     // Alice sends another message
     final msg3 = await aliceSession.encryptToJid(

test/omemomanager_test.dart

@@ -28,7 +28,8 @@ void main() {
     var aliceEmptyMessageSent = 0;
     var bobEmptyMessageSent = 0;
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
@@ -39,7 +40,7 @@ void main() {
       },
       (jid) async {
         expect(jid, bobJid);
-        return [ bobDevice.id ];
+        return [bobDevice.id];
       },
       (jid, id) async {
         expect(jid, bobJid);
@@ -123,7 +124,8 @@ void main() {
     var aliceEmptyMessageSent = 0;
     var bobEmptyMessageSent = 0;
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
@@ -134,7 +136,7 @@ void main() {
       },
       (jid) async {
         expect(jid, bobJid);
-        return [ bobDevice.id ];
+        return [bobDevice.id];
       },
       (jid, id) async {
         expect(jid, bobJid);
@@ -235,7 +237,8 @@ void main() {
   test('Test accessing data without it existing', () async {
     const aliceJid = 'alice@server1';
     const bobJid = 'bob@server2';
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
       aliceDevice,
@@ -264,9 +267,12 @@ void main() {
     const bobJid = 'bob@server2';
     var oldDevice = true;
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
-    final bobOldDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
-    final bobCurrentDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+    final bobOldDevice =
+        await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+    final bobCurrentDevice =
+        await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
       aliceDevice,
@@ -275,15 +281,13 @@ void main() {
       (jid) async {
         expect(jid, bobJid);
 
-        return oldDevice ?
+        return oldDevice ? [bobOldDevice.id] : [bobCurrentDevice.id];
-          [ bobOldDevice.id ] :
-          [ bobCurrentDevice.id ];
       },
       (jid, id) async {
         expect(jid, bobJid);
-        return oldDevice ?
+        return oldDevice
-          bobOldDevice.toBundle() :
+            ? bobOldDevice.toBundle()
-          bobCurrentDevice.toBundle();
+            : bobCurrentDevice.toBundle();
       },
       (jid) async {},
     );
@@ -348,9 +352,12 @@ void main() {
     const bobJid = 'bob@server2';
     var bothDevices = false;
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
-    final bobDevice1 = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
-    final bobDevice2 = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+    final bobDevice1 =
+        await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+    final bobDevice2 =
+        await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
       aliceDevice,
@@ -361,9 +368,7 @@ void main() {
 
         return [
           bobDevice1.id,
-
+          if (bothDevices) bobDevice2.id,
-          if (bothDevices)
-            bobDevice2.id,
         ];
       },
       (jid, id) async {
@@ -456,9 +461,12 @@ void main() {
     const bobJid = 'bob@server2';
     var bothDevices = false;
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
-    final bobDevice1 = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
-    final bobDevice2 = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+    final bobDevice1 =
+        await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
+    final bobDevice2 =
+        await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
       aliceDevice,
@@ -469,9 +477,7 @@ void main() {
 
         return [
           bobDevice1.id,
-
+          if (bothDevices) bobDevice2.id,
-          if (bothDevices)
-            bobDevice2.id,
         ];
       },
       (jid, id) async {
@@ -603,9 +609,11 @@ void main() {
     const bobJid = 'bob@server2';
     const cocoJid = 'coco@server3';
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
-    final cocoDevice = await OmemoDevice.generateNewDevice(cocoJid, opkAmount: 1);
+    final cocoDevice =
+        await OmemoDevice.generateNewDevice(cocoJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
       aliceDevice,
@@ -687,7 +695,8 @@ void main() {
     const bobJid = 'bob@server2';
     var failure = false;
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
@@ -697,16 +706,12 @@ void main() {
       (jid) async {
         expect(jid, bobJid);
 
-        return failure ?
+        return failure ? null : [bobDevice.id];
-          null :
-          [bobDevice.id];
       },
       (jid, id) async {
         expect(jid, bobJid);
 
-        return failure ?
+        return failure ? null : bobDevice.toBundle();
-          null :
-          bobDevice.toBundle();
       },
       (jid) async {},
     );
@@ -778,7 +783,8 @@ void main() {
     const aliceJid = 'alice@server1';
     const bobJid = 'bob@server2';
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
       aliceDevice,
@@ -806,7 +812,10 @@ void main() {
     );
 
     expect(aliceResult.isSuccess(1), false);
-    expect(aliceResult.jidEncryptionErrors[bobJid] is NoKeyMaterialAvailableException, true);
+    expect(
+        aliceResult.jidEncryptionErrors[bobJid]
+            is NoKeyMaterialAvailableException,
+        true,);
   });
 
   test('Test sending a message two two JIDs with failed lookups', () async {
@@ -814,7 +823,8 @@ void main() {
     const bobJid = 'bob@server2';
     const cocoJid = 'coco@server3';
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
@@ -855,7 +865,10 @@ void main() {
     );
 
     expect(aliceResult.isSuccess(2), true);
-    expect(aliceResult.jidEncryptionErrors[cocoJid] is NoKeyMaterialAvailableException, true);
+    expect(
+        aliceResult.jidEncryptionErrors[cocoJid]
+            is NoKeyMaterialAvailableException,
+        true,);
 
     // Bob decrypts it
     final bobResult = await bobManager.onIncomingStanza(
@@ -875,7 +888,8 @@ void main() {
     const aliceJid = 'alice@server1';
     const bobJid = 'bob@server2';
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
@@ -920,7 +934,6 @@ void main() {
         aliceMessage.encryptedKeys,
         base64.encode(aliceMessage.ciphertext!),
       ),
-
     );
 
     // Ratchets are acked
@@ -957,7 +970,8 @@ void main() {
     const aliceJid = 'alice@server1';
     const bobJid = 'bob@server2';
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     EncryptionResult? aliceEmptyMessage;
@@ -1084,14 +1098,17 @@ void main() {
     expect(aliceResult4.payload, "That's okay.");
   });
 
-  test('Test removing all ratchets and sending a message without post-heartbeat ack', () async {
+  test(
+      'Test removing all ratchets and sending a message without post-heartbeat ack',
+      () async {
     // This test is the same as "Test removing all ratchets and sending a message" except
     // that bob does not ack the ratchet after Alice's heartbeat after she recreated
     // all ratchets.
     const aliceJid = 'alice@server1';
     const bobJid = 'bob@server2';
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     EncryptionResult? aliceEmptyMessage;
@@ -1216,7 +1233,8 @@ void main() {
     const aliceJid = 'alice@server1';
     const bobJid = 'bob@server2';
 
-    final aliceDevice = await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
+    final aliceDevice =
+        await OmemoDevice.generateNewDevice(aliceJid, opkAmount: 1);
     final bobDevice = await OmemoDevice.generateNewDevice(bobJid, opkAmount: 1);
 
     final aliceManager = OmemoManager(
@@ -1225,7 +1243,7 @@ void main() {
       (result, recipientJid) async {},
       (jid) async {
         expect(jid, bobJid);
-        return [ bobDevice.id ];
+        return [bobDevice.id];
       },
       (jid, id) async {
         expect(jid, bobJid);

test/protobuf_test.dart

@@ -169,7 +169,7 @@ void main() {
       expect(decoded.pkId, 698);
       expect(decoded.spkId, 245);
       expect(decoded.ik, <int>[1, 4, 6]);
-      expect(decoded.ek, <int>[4 ,6 ,7 , 80]);
+      expect(decoded.ek, <int>[4, 6, 7, 80]);
 
       expect(decoded.message!.mac, <int>[5, 6, 8, 0]);
       expect(decoded.message!.message, <int>[4, 5, 7, 3, 2]);

test/serialisation_test.dart

@@ -22,14 +22,16 @@ void main() {
     expect(await oldDevice.equals(newDevice), true);
   });
 
-  test('Test serialising and deserialising the Device after rotating the SPK', () async {
+  test('Test serialising and deserialising the Device after rotating the SPK',
+      () async {
     // Generate a random session
     final oldSession = await OmemoSessionManager.generateNewIdentity(
       'user@test.server',
       AlwaysTrustingTrustManager(),
       opkAmount: 1,
     );
-    final oldDevice = await (await oldSession.getDevice()).replaceSignedPrekey();
+    final oldDevice =
+        await (await oldSession.getDevice()).replaceSignedPrekey();
     final serialised = jsonify(await oldDevice.toJson());
 
     final newDevice = OmemoDevice.fromJson(serialised);
@@ -64,7 +66,8 @@ void main() {
       aliceMessage.encryptedKeys,
       getTimestamp(),
     );
-    final aliceOld = aliceSession.getRatchet(bobJid, await bobSession.getDeviceId());
+    final aliceOld =
+        aliceSession.getRatchet(bobJid, await bobSession.getDeviceId());
     final aliceSerialised = jsonify(await aliceOld.toJson());
     final aliceNew = OmemoDoubleRatchet.fromJson(aliceSerialised);
 
@@ -116,7 +119,8 @@ void main() {
     expect(result2.deviceId, test2.deviceId);
   });
 
-  test('Test serializing and deserializing the components of the BTBV manager', () async {
+  test('Test serializing and deserializing the components of the BTBV manager',
+      () async {
     // Caroline's BTBV manager
     final btbv = MemoryBTBVTrustManager();
     // Example data
@@ -130,17 +134,20 @@ void main() {
     await btbv.onNewSession(bobJid, 4);
 
     final serialized = jsonify(await btbv.toJson());
-    final deviceList = BlindTrustBeforeVerificationTrustManager.deviceListFromJson(
+    final deviceList =
+        BlindTrustBeforeVerificationTrustManager.deviceListFromJson(
       serialized,
     );
     expect(btbv.devices, deviceList);
 
-    final trustCache = BlindTrustBeforeVerificationTrustManager.trustCacheFromJson(
+    final trustCache =
+        BlindTrustBeforeVerificationTrustManager.trustCacheFromJson(
       serialized,
     );
     expect(btbv.trustCache, trustCache);
 
-    final enableCache = BlindTrustBeforeVerificationTrustManager.enableCacheFromJson(
+    final enableCache =
+        BlindTrustBeforeVerificationTrustManager.enableCacheFromJson(
       serialized,
     );
     expect(btbv.enablementCache, enableCache);

test/x3dh_test.dart

@@ -71,9 +71,10 @@ void main() {
     var exception = false;
     try {
       await x3dhFromBundle(bundleBob, ikAlice);
-    } catch(e) {
+    } catch (e) {
       exception = true;
-      expect(e is InvalidSignatureException, true, reason: 'Expected InvalidSignatureException, but got $e');
+      expect(e is InvalidSignatureException, true,
+          reason: 'Expected InvalidSignatureException, but got $e',);
     }
 
     expect(exception, true, reason: 'Expected test failure');