.gitlint

@@ -1,14 +0,0 @@
-[general]
-ignore=B5,B6,B7,B8
-
-[title-max-length]
-line-length=72
-
-[title-trailing-punctuation]
-[title-hard-tab]
-[title-match-regex]
-regex=^((feat|fix|chore|refactor|docs|release|test)\((meta|tests|style|docs|xep|core)+(,(meta|tests|style|docs|xep|core))*\)|release): [A-Z0-9].*$
-
-
-[body-trailing-whitespace]
-[body-first-line-empty]

CONTRIBUTING.md

@@ -1,19 +0,0 @@
-# Contribution Guide
-
-Thanks for your interest in the moxxmpp XMPP library! This document contains guidelines and guides for working on the moxxmpp codebase.
-
-## Contributing
-
-If you want to fix a small issue, you can just fork, create a new branch, and start working right away. However, if you want to work
-on a bigger feature, please first create an issue (if an issue does not already exist) or join the [development chat](xmpp:moxxy@muc.moxxy.org?join) (xmpp:moxxy@muc.moxxy.org?join)
-to discuss the feature first.
-
-Before creating a pull request, please make sure you checked every item on the following checklist:
-
-- [ ] I formatted the code with the dart formatter (`dart format`) before running the linter
-- [ ] I ran the linter (`dart analyze`) and introduced no new linter warnings
-- [ ] I ran the tests (`dart test`) and introduced no new failing tests
-- [ ] I used [gitlint](https://github.com/jorisroovers/gitlint) to ensure propper formatting of my commig messages
-
-If you think that your code is ready for a pull request, but you are not sure if it is ready, prefix the PR's title with "WIP: ", so that discussion
-can happen there. If you think your PR is ready for review, remove the "WIP: " prefix.

flake.lock

@@ -17,16 +17,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1676076353,
+        "lastModified": 1667610399,
-        "narHash": "sha256-mdUtE8Tp40cZETwcq5tCwwLqkJVV1ULJQ5GKRtbshag=",
+        "narHash": "sha256-XZd0f4ZWAY0QOoUSdiNWj/eFiKb4B9CJPtl9uO9SYY4=",
-        "owner": "AtaraxiaSjel",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5deb99bdccbbb97e7562dee4ba8a3ee3021688e6",
+        "rev": "1dd8696f96db47156e1424a49578fe7dd4ce99a4",
         "type": "github"
       },
       "original": {
-        "owner": "AtaraxiaSjel",
+        "owner": "NixOS",
-        "ref": "update/flutter",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "moxxmpp";
   inputs = {
-    nixpkgs.url = "github:AtaraxiaSjel/nixpkgs/update/flutter";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

packages/moxxmpp/lib/src/buffer.dart

@@ -6,21 +6,16 @@ import 'package:xml/xml.dart';
 import 'package:xml/xml_events.dart';
 
 class XmlStreamBuffer extends StreamTransformerBase<String, XMLNode> {
-  XmlStreamBuffer()
+
-      : _streamController = StreamController(),
+  XmlStreamBuffer() : _streamController = StreamController(), _decoder = const XmlNodeDecoder();
-        _decoder = const XmlNodeDecoder();
   final StreamController<XMLNode> _streamController;
   final XmlNodeDecoder _decoder;
 
   @override
   Stream<XMLNode> bind(Stream<String> stream) {
-    stream
+    stream.toXmlEvents().selectSubtreeEvents((event) {
-        .toXmlEvents()
-        .selectSubtreeEvents((event) {
       return event.qualifiedName != 'stream:stream';
-        })
+    }).transform(_decoder).listen((nodes) {
-        .transform(_decoder)
-        .listen((nodes) {
       for (final node in nodes) {
         if (node.nodeType == XmlNodeType.ELEMENT) {
           _streamController.add(XMLNode.fromXmlElement(node as XmlElement));

packages/moxxmpp/lib/src/connection.dart

@@ -61,8 +61,7 @@ enum StanzaFromType {
 
 /// Nonza describing the XMPP stream header.
 class StreamHeaderNonza extends XMLNode {
-  StreamHeaderNonza(String serverDomain)
+  StreamHeaderNonza(String serverDomain) : super(
-      : super(
       tag: 'stream:stream',
       attributes: <String, String>{
         'xmlns': stanzaXmlns,
@@ -78,9 +77,11 @@ class StreamHeaderNonza extends XMLNode {
 /// The result of an awaited connection.
 class XmppConnectionResult {
   const XmppConnectionResult(
-    this.success, {
+    this.success,
+    {
       this.error,
-  });
+    }
+  );
 
   /// True if the connection was successful. False if it failed for any reason.
   final bool success;
@@ -95,10 +96,12 @@ class XmppConnection {
   XmppConnection(
     ReconnectionPolicy reconnectionPolicy,
     ConnectivityManager connectivityManager,
-    this._socket, {
+    this._socket,
+    {
       this.connectionPingDuration = const Duration(minutes: 3),
       this.connectingTimeout = const Duration(minutes: 2),
-  })  : _reconnectionPolicy = reconnectionPolicy,
+    }
+  ) : _reconnectionPolicy = reconnectionPolicy,
       _connectivityManager = connectivityManager {
     // Allow the reconnection policy to perform reconnections by itself
     _reconnectionPolicy.register(
@@ -112,6 +115,7 @@ class XmppConnection {
     _socket.getEventStream().listen(_handleSocketEvent);
   }
 
+
   /// The state that the connection is currently in
   XmppConnectionState _connectionState = XmppConnectionState.notConnected;
 
@@ -135,16 +139,11 @@ class XmppConnection {
   final StanzaAwaiter _stanzaAwaiter = StanzaAwaiter();
   
   /// Sorted list of handlers that we call or incoming and outgoing stanzas
-  final List<StanzaHandler> _incomingStanzaHandlers =
+  final List<StanzaHandler> _incomingStanzaHandlers = List.empty(growable: true);
-      List.empty(growable: true);
+  final List<StanzaHandler> _incomingPreStanzaHandlers = List.empty(growable: true);
-  final List<StanzaHandler> _incomingPreStanzaHandlers =
+  final List<StanzaHandler> _outgoingPreStanzaHandlers = List.empty(growable: true);
-      List.empty(growable: true);
+  final List<StanzaHandler> _outgoingPostStanzaHandlers = List.empty(growable: true);
-  final List<StanzaHandler> _outgoingPreStanzaHandlers =
+  final StreamController<XmppEvent> _eventStreamController = StreamController.broadcast();
-      List.empty(growable: true);
-  final List<StanzaHandler> _outgoingPostStanzaHandlers =
-      List.empty(growable: true);
-  final StreamController<XmppEvent> _eventStreamController =
-      StreamController.broadcast();
   final Map<String, XmppManagerBase> _xmppManagers = {};
   
   /// Disco info we got after binding a resource (xmlns)
@@ -186,7 +185,6 @@ class XmppConnection {
   final Map<String, XmppFeatureNegotiatorBase> _featureNegotiators = {};
   XmppFeatureNegotiatorBase? _currentNegotiator;
   final List<XMLNode> _streamFeatures = List.empty(growable: true);
-
   /// Prevent data from being passed to _currentNegotiator.negotiator while the negotiator
   /// is still running.
   final Lock _negotiationLock = Lock();
@@ -202,8 +200,7 @@ class XmppConnection {
   /// and does the following:
   /// - if _isConnectionRunning is false, set it to true and return false.
   /// - if _isConnectionRunning is true, return true.
-  Future<bool> _testAndSetIsConnectionRunning() async =>
+  Future<bool> _testAndSetIsConnectionRunning() async => _connectionRunningLock.synchronized(() {
-      _connectionRunningLock.synchronized(() {
     if (!_isConnectionRunning) {
       _isConnectionRunning = true;
       return false;
@@ -214,8 +211,7 @@ class XmppConnection {
 
   /// Enters the critical section for accessing [XmppConnection._isConnectionRunning]
   /// and sets it to false.
-  Future<void> _resetIsConnectionRunning() async =>
+  Future<void> _resetIsConnectionRunning() async => _connectionRunningLock.synchronized(() => _isConnectionRunning = false);
-      _connectionRunningLock.synchronized(() => _isConnectionRunning = false);
   
   ReconnectionPolicy get reconnectionPolicy => _reconnectionPolicy;
   
@@ -225,8 +221,7 @@ class XmppConnection {
   
   /// Return the registered feature negotiator that has id [id]. Returns null if
   /// none can be found.
-  T? getNegotiatorById<T extends XmppFeatureNegotiatorBase>(String id) =>
+  T? getNegotiatorById<T extends XmppFeatureNegotiatorBase>(String id) => _featureNegotiators[id] as T?;
-      _featureNegotiators[id] as T?;
   
   /// Registers a list of [XmppManagerBase] sub-classes as managers on this connection.
   Future<void> registerManagers(List<XmppManagerBase> managers) async {
@@ -252,8 +247,7 @@ class XmppConnection {
       _incomingStanzaHandlers.addAll(manager.getIncomingStanzaHandlers());
       _incomingPreStanzaHandlers.addAll(manager.getIncomingPreStanzaHandlers());
       _outgoingPreStanzaHandlers.addAll(manager.getOutgoingPreStanzaHandlers());
-      _outgoingPostStanzaHandlers
+      _outgoingPostStanzaHandlers.addAll(manager.getOutgoingPostStanzaHandlers());
-          .addAll(manager.getOutgoingPostStanzaHandlers());
     }
 
     // Sort them
@@ -309,16 +303,12 @@ class XmppConnection {
   }
   
   /// Returns the Manager with id [id] or null if such a manager is not registered.
-  T? getManagerById<T extends XmppManagerBase>(String id) =>
+  T? getManagerById<T extends XmppManagerBase>(String id) => _xmppManagers[id] as T?;
-      _xmppManagers[id] as T?;
 
   /// A [PresenceManager] is required, so have a wrapper for getting it.
   /// Returns the registered [PresenceManager].
   PresenceManager getPresenceManager() {
-    assert(
+    assert(_xmppManagers.containsKey(presenceManager), 'A PresenceManager is mandatory');
-      _xmppManagers.containsKey(presenceManager),
-      'A PresenceManager is mandatory',
-    );
 
     return getManagerById(presenceManager)!;
   }
@@ -326,10 +316,7 @@ class XmppConnection {
   /// A [DiscoManager] is required so, have a wrapper for getting it.
   /// Returns the registered [DiscoManager].
   DiscoManager getDiscoManager() {
-    assert(
+    assert(_xmppManagers.containsKey(discoManager), 'A DiscoManager is mandatory');
-      _xmppManagers.containsKey(discoManager),
-      'A DiscoManager is mandatory',
-    );
 
     return getManagerById(discoManager)!;
   }
@@ -337,10 +324,7 @@ class XmppConnection {
   /// A [RosterManager] is required, so have a wrapper for getting it.
   /// Returns the registered [RosterManager].
   RosterManager getRosterManager() {
-    assert(
+    assert(_xmppManagers.containsKey(rosterManager), 'A RosterManager is mandatory');
-      _xmppManagers.containsKey(rosterManager),
-      'A RosterManager is mandatory',
-    );
 
     return getManagerById(rosterManager)!;
   }
@@ -368,9 +352,7 @@ class XmppConnection {
   /// Attempts to reconnect to the server by following an exponential backoff.
   Future<void> _attemptReconnection() async {
     if (await _testAndSetIsConnectionRunning()) {
-      _log.warning(
+      _log.warning('_attemptReconnection is called but connection attempt is already running. Ignoring...');
-        '_attemptReconnection is called but connection attempt is already running. Ignoring...',
-      );
       return;
     }
 
@@ -396,13 +378,8 @@ class XmppConnection {
     // the connection result is being awaited, don't attempt a reconnection but instead
     // try to gracefully disconnect.
     if (_connectionCompleter != null) {
-      _log.info(
+      _log.info('Not triggering reconnection since connection result is being awaited');
-        'Not triggering reconnection since connection result is being awaited',
+      await _disconnect(triggeredByUser: false, state: XmppConnectionState.error);
-      );
-      await _disconnect(
-        triggeredByUser: false,
-        state: XmppConnectionState.error,
-      );
       _connectionCompleter?.complete(
         XmppConnectionResult(
           false,
@@ -415,9 +392,7 @@ class XmppConnection {
 
     if (!error.isRecoverable()) {
       // We cannot recover this error
-      _log.severe(
+      _log.severe('Since a $error is not recoverable, not attempting a reconnection');
-        'Since a $error is not recoverable, not attempting a reconnection',
-      );
       await _setConnectionState(XmppConnectionState.error);
       await _sendEvent(
         NonRecoverableErrorEvent(error),
@@ -436,14 +411,10 @@ class XmppConnection {
       await handleError(SocketError(event));
     } else if (event is XmppSocketClosureEvent) {
       if (!event.expected) {
-        _log.fine(
+        _log.fine('Received unexpected XmppSocketClosureEvent. Reconnecting...');
-          'Received unexpected XmppSocketClosureEvent. Reconnecting...',
-        );
         await handleError(SocketError(XmppSocketErrorEvent(event)));
       } else {
-        _log.fine(
+        _log.fine('Received XmppSocketClosureEvent. No reconnection attempt since _socketClosureTriggersReconnect is false...');
-          'Received XmppSocketClosureEvent. No reconnection attempt since _socketClosureTriggersReconnect is false...',
-        );
       }
     }
   }
@@ -473,8 +444,10 @@ class XmppConnection {
   
   /// Returns true if we can send data through the socket.
   Future<bool> _canSendData() async {
-    return [XmppConnectionState.connected, XmppConnectionState.connecting]
+    return [
-        .contains(await getConnectionState());
+      XmppConnectionState.connected,
+      XmppConnectionState.connecting
+    ].contains(await getConnectionState());
   }
   
   /// Sends a [stanza] to the server. If stream management is enabled, then keeping track
@@ -486,43 +459,25 @@ class XmppConnection {
   /// If addId is true, then an 'id' attribute will be added to the stanza if [stanza] has
   /// none.
   // TODO(Unknown): if addId = false, the function crashes.
-  Future<XMLNode> sendStanza(
+  Future<XMLNode> sendStanza(Stanza stanza, { StanzaFromType addFrom = StanzaFromType.full, bool addId = true, bool awaitable = true, bool encrypted = false, bool forceEncryption = false, }) async {
-    Stanza stanza, {
+    assert(implies(addId == false && stanza.id == null, !awaitable), 'Cannot await a stanza with no id');
-    StanzaFromType addFrom = StanzaFromType.full,
-    bool addId = true,
-    bool awaitable = true,
-    bool encrypted = false,
-    bool forceEncryption = false,
-  }) async {
-    assert(
-      implies(addId == false && stanza.id == null, !awaitable),
-      'Cannot await a stanza with no id',
-    );
 
     // Add extra data in case it was not set
     var stanza_ = stanza;
     if (addId && (stanza_.id == null || stanza_.id == '')) {
       stanza_ = stanza.copyWith(id: generateId());
     }
-    if (addFrom != StanzaFromType.none &&
+    if (addFrom != StanzaFromType.none && (stanza_.from == null || stanza_.from == '')) {
-        (stanza_.from == null || stanza_.from == '')) {
       switch (addFrom) {
-        case StanzaFromType.full:
+        case StanzaFromType.full: {
-          {
+          stanza_ = stanza_.copyWith(from: _connectionSettings.jid.withResource(_resource).toString());
-            stanza_ = stanza_.copyWith(
-              from: _connectionSettings.jid.withResource(_resource).toString(),
-            );
         }
         break;
-        case StanzaFromType.bare:
+        case StanzaFromType.bare: {
-          {
+          stanza_ = stanza_.copyWith(from: _connectionSettings.jid.toBare().toString());
-            stanza_ = stanza_.copyWith(
-              from: _connectionSettings.jid.toBare().toString(),
-            );
         }
         break;
-        case StanzaFromType.none:
+        case StanzaFromType.none: break;
-          break;
       }
     }
 
@@ -549,16 +504,16 @@ class XmppConnection {
         from: data.stanza.to,
         attributes: <String, String>{
           'type': 'error',
-          ...data.stanza.id != null
+          ...data.stanza.id != null ? {
-              ? {
             'id': data.stanza.id!,
-                }
+          } : {},
-              : {},
         },
       );
     }
 
-    final prefix = data.encrypted ? '(Encrypted) ' : '';
+    final prefix = data.encrypted ?
+      '(Encrypted) ' :
+      '';
     _log.finest('==> $prefix${stanza_.toXml()}');
 
     final stanzaString = data.stanza.toXml();
@@ -628,9 +583,7 @@ class XmppConnection {
     final oldState = _connectionState;
     _connectionState = state;
 
-    final sm = getNegotiatorById<StreamManagementNegotiator>(
+    final sm = getNegotiatorById<StreamManagementNegotiator>(streamManagementNegotiator);
-      streamManagementNegotiator,
-    );
     await _sendEvent(
       ConnectionStateChangedEvent(
         state,
@@ -641,8 +594,7 @@ class XmppConnection {
     
     if (state == XmppConnectionState.connected) {
       _log.finest('Starting _pingConnectionTimer');
-      _connectionPingTimer =
+      _connectionPingTimer = Timer.periodic(connectionPingDuration, _pingConnectionOpen);
-          Timer.periodic(connectionPingDuration, _pingConnectionOpen);
 
       // We are connected, so the timer can stop.
       _destroyConnectingTimer();
@@ -693,20 +645,14 @@ class XmppConnection {
       _log.finest('_pingConnectionTimer: Connected. Triggering a ping event.');
       unawaited(_sendEvent(SendPingEvent()));
     } else {
-      _log.finest(
+      _log.finest('_pingConnectionTimer: Not connected. Not triggering an event.');
-        '_pingConnectionTimer: Not connected. Not triggering an event.',
-      );
     }
   }
 
   /// Iterate over [handlers] and check if the handler matches [stanza]. If it does,
   /// call its callback and end the processing if the callback returned true; continue
   /// if it returned false.
-  Future<StanzaHandlerData> _runStanzaHandlers(
+  Future<StanzaHandlerData> _runStanzaHandlers(List<StanzaHandler> handlers, Stanza stanza, { StanzaHandlerData? initial }) async {
-    List<StanzaHandler> handlers,
-    Stanza stanza, {
-    StanzaHandlerData? initial,
-  }) async {
     var state = initial ?? StanzaHandlerData(false, false, null, stanza);
     for (final handler in handlers) {
       if (handler.matches(state.stanza)) {
@@ -718,36 +664,19 @@ class XmppConnection {
     return state;
   }
 
-  Future<StanzaHandlerData> _runIncomingStanzaHandlers(
+  Future<StanzaHandlerData> _runIncomingStanzaHandlers(Stanza stanza, { StanzaHandlerData? initial }) async {
-    Stanza stanza, {
+    return _runStanzaHandlers(_incomingStanzaHandlers, stanza, initial: initial);
-    StanzaHandlerData? initial,
-  }) async {
-    return _runStanzaHandlers(
-      _incomingStanzaHandlers,
-      stanza,
-      initial: initial,
-    );
   }
 
   Future<StanzaHandlerData> _runIncomingPreStanzaHandlers(Stanza stanza) async {
     return _runStanzaHandlers(_incomingPreStanzaHandlers, stanza);
   }
 
-  Future<StanzaHandlerData> _runOutgoingPreStanzaHandlers(
+  Future<StanzaHandlerData> _runOutgoingPreStanzaHandlers(Stanza stanza, { StanzaHandlerData? initial }) async {
-    Stanza stanza, {
+    return _runStanzaHandlers(_outgoingPreStanzaHandlers, stanza, initial: initial);
-    StanzaHandlerData? initial,
-  }) async {
-    return _runStanzaHandlers(
-      _outgoingPreStanzaHandlers,
-      stanza,
-      initial: initial,
-    );
   }
 
-  Future<bool> _runOutgoingPostStanzaHandlers(
+  Future<bool> _runOutgoingPostStanzaHandlers(Stanza stanza, { StanzaHandlerData? initial }) async {
-    Stanza stanza, {
-    StanzaHandlerData? initial,
-  }) async {
     final data = await _runStanzaHandlers(
       _outgoingPostStanzaHandlers,
       stanza,
@@ -763,12 +692,14 @@ class XmppConnection {
       _log.finest('<== ${nonza.toXml()}');
 
       var nonzaHandled = false;
-      await Future.forEach(_xmppManagers.values,
+      await Future.forEach(
+        _xmppManagers.values,
         (XmppManagerBase manager) async {
           final handled = await manager.runNonzaHandlers(nonza);
 
           if (!nonzaHandled && handled) nonzaHandled = true;
-      });
+        }
+      );
 
       if (!nonzaHandled) {
         _log.warning('Unhandled nonza received: ${nonza.toXml()}');
@@ -781,10 +712,9 @@ class XmppConnection {
     // Run the incoming stanza handlers and bounce with an error if no manager handled
     // it.
     final incomingPreHandlers = await _runIncomingPreStanzaHandlers(stanza);
-    final prefix = incomingPreHandlers.encrypted &&
+    final prefix = incomingPreHandlers.encrypted && incomingPreHandlers.other['encryption_error'] == null ?
-            incomingPreHandlers.other['encryption_error'] == null
+      '(Encrypted) ' :
-        ? '(Encrypted) '
+      '';
-        : '';
     _log.finest('<== $prefix${incomingPreHandlers.stanza.toXml()}');
 
     final awaited = await _stanzaAwaiter.onData(
@@ -815,10 +745,11 @@ class XmppConnection {
   /// Returns true if all mandatory features in [features] have been negotiated.
   /// Otherwise returns false.
   bool _isMandatoryNegotiationDone(List<XMLNode> features) {
-    return features.every((XMLNode feature) {
+    return features.every(
-      return feature.firstTag('required') == null &&
+      (XMLNode feature) {
-          feature.tag != 'mechanisms';
+        return feature.firstTag('required') == null && feature.tag != 'mechanisms';
-    });
+      }
+    );
   }
 
   /// Returns true if we can still negotiate. Returns false if no negotiator is
@@ -830,21 +761,18 @@ class XmppConnection {
   /// Returns the next negotiator that matches [features]. Returns null if none can be
   /// picked. If [log] is true, then the list of matching negotiators will be logged.
   @visibleForTesting
-  XmppFeatureNegotiatorBase? getNextNegotiator(
+  XmppFeatureNegotiatorBase? getNextNegotiator(List<XMLNode> features, {bool log = true}) {
-    List<XMLNode> features, {
-    bool log = true,
-  }) {
     final matchingNegotiators = _featureNegotiators.values
-        .where((XmppFeatureNegotiatorBase negotiator) {
+      .where(
-      return negotiator.state == NegotiatorState.ready &&
+        (XmppFeatureNegotiatorBase negotiator) {
-          negotiator.matchesFeature(features);
+          return negotiator.state == NegotiatorState.ready && negotiator.matchesFeature(features);
-    }).toList()
+        }
+      )
+      .toList()
       ..sort((a, b) => b.priority.compareTo(a.priority));
 
     if (log) {
-      _log.finest(
+      _log.finest('List of matching negotiators: ${matchingNegotiators.map((a) => a.id)}');
-        'List of matching negotiators: ${matchingNegotiators.map((a) => a.id)}',
-      );
     }
     
     if (matchingNegotiators.isEmpty) return null;
@@ -874,9 +802,7 @@ class XmppConnection {
   Future<void> _executeCurrentNegotiator(XMLNode nonza) async {
     // If we don't have a negotiator get one
     _currentNegotiator ??= getNextNegotiator(_streamFeatures);
-    if (_currentNegotiator == null &&
+    if (_currentNegotiator == null && _isMandatoryNegotiationDone(_streamFeatures) && !_isNegotiationPossible(_streamFeatures)) {
-        _isMandatoryNegotiationDone(_streamFeatures) &&
-        !_isNegotiationPossible(_streamFeatures)) {
       _log.finest('Negotiations done!');
       _updateRoutingState(RoutingState.handleStanzas);
       await _onNegotiationsDone();
@@ -894,22 +820,20 @@ class XmppConnection {
     final state = result.get<NegotiatorState>();
     _currentNegotiator!.state = state;
     switch (state) {
-      case NegotiatorState.ready:
+      case NegotiatorState.ready: return;
-        return;
       case NegotiatorState.done:
       if (_currentNegotiator!.sendStreamHeaderWhenDone) {
         _currentNegotiator = null;
         _streamFeatures.clear();
         _sendStreamHeader();
       } else {
-          _streamFeatures.removeWhere((node) {
+        _streamFeatures
-            return node.attributes['xmlns'] ==
+          .removeWhere((node) {
-                _currentNegotiator!.negotiatingXmlns;
+            return node.attributes['xmlns'] == _currentNegotiator!.negotiatingXmlns;
           });
         _currentNegotiator = null;
 
-          if (_isMandatoryNegotiationDone(_streamFeatures) &&
+        if (_isMandatoryNegotiationDone(_streamFeatures) && !_isNegotiationPossible(_streamFeatures)) {
-              !_isNegotiationPossible(_streamFeatures)) {
           _log.finest('Negotiations done!');
           _updateRoutingState(RoutingState.handleStanzas);
           await _resetIsConnectionRunning();
@@ -931,8 +855,8 @@ class XmppConnection {
       _log.finest('Negotiator wants to continue later. Picking new one...');
       _currentNegotiator!.state = NegotiatorState.ready;
 
-        if (_isMandatoryNegotiationDone(_streamFeatures) &&
+      
-            !_isNegotiationPossible(_streamFeatures)) {
+      if (_isMandatoryNegotiationDone(_streamFeatures) && !_isNegotiationPossible(_streamFeatures)) {
         _log.finest('Negotiations done!');
 
         _updateRoutingState(RoutingState.handleStanzas);
@@ -950,9 +874,7 @@ class XmppConnection {
       }
       break;
       case NegotiatorState.skipRest:
-        _log.finest(
+      _log.finest('Negotiator wants to skip the remaining negotiation... Negotiations (assumed) done!');
-          'Negotiator wants to skip the remaining negotiation... Negotiations (assumed) done!',
-        );
 
       _updateRoutingState(RoutingState.handleStanzas);
       await _resetIsConnectionRunning();
@@ -1019,17 +941,13 @@ class XmppConnection {
 
     // Specific event handling
     if (event is ResourceBindingSuccessEvent) {
-      _log.finest(
+      _log.finest('Received ResourceBindingSuccessEvent. Setting _resource to ${event.resource}');
-        'Received ResourceBindingSuccessEvent. Setting _resource to ${event.resource}',
-      );
       setResource(event.resource);
 
       _log.finest('Resetting _serverFeatures');
       _serverFeatures.clear();
     } else if (event is AuthenticationSuccessEvent) {
-      _log.finest(
+      _log.finest('Received AuthenticationSuccessEvent. Setting _isAuthenticated to true');
-        'Received AuthenticationSuccessEvent. Setting _isAuthenticated to true',
-      );
       _isAuthenticated = true;
     }
     
@@ -1045,7 +963,9 @@ class XmppConnection {
     _socket.write(
       XMLNode(
         tag: 'xml',
-        attributes: <String, String>{'version': '1.0'},
+        attributes: <String, String>{
+          'version': '1.0'
+        },
         closeTag: false,
         isDeclaration: true,
         children: [
@@ -1067,10 +987,7 @@ class XmppConnection {
     await _disconnect(state: XmppConnectionState.notConnected);
   }
 
-  Future<void> _disconnect({
+  Future<void> _disconnect({required XmppConnectionState state, bool triggeredByUser = true}) async {
-    required XmppConnectionState state,
-    bool triggeredByUser = true,
-  }) async {
     await _reconnectionPolicy.setShouldReconnect(false);
 
     if (triggeredByUser) {
@@ -1094,30 +1011,15 @@ class XmppConnection {
   
   /// Make sure that all required managers are registered
   void _runPreConnectionAssertions() {
-    assert(
+    assert(_xmppManagers.containsKey(presenceManager), 'A PresenceManager is mandatory');
-      _xmppManagers.containsKey(presenceManager),
+    assert(_xmppManagers.containsKey(rosterManager), 'A RosterManager is mandatory');
-      'A PresenceManager is mandatory',
+    assert(_xmppManagers.containsKey(discoManager), 'A DiscoManager is mandatory');
-    );
+    assert(_xmppManagers.containsKey(pingManager), 'A PingManager is mandatory');
-    assert(
-      _xmppManagers.containsKey(rosterManager),
-      'A RosterManager is mandatory',
-    );
-    assert(
-      _xmppManagers.containsKey(discoManager),
-      'A DiscoManager is mandatory',
-    );
-    assert(
-      _xmppManagers.containsKey(pingManager),
-      'A PingManager is mandatory',
-    );
   }
   
   /// Like [connect] but the Future resolves when the resource binding is either done or
   /// SASL has failed.
-  Future<XmppConnectionResult> connectAwaitable({
+  Future<XmppConnectionResult> connectAwaitable({ String? lastResource, bool waitForConnection = false }) async {
-    String? lastResource,
-    bool waitForConnection = false,
-  }) async {
     _runPreConnectionAssertions();
     await _resetIsConnectionRunning();
     _connectionCompleter = Completer();
@@ -1131,16 +1033,9 @@ class XmppConnection {
   }
  
   /// Start the connection process using the provided connection settings.
-  Future<void> connect({
+  Future<void> connect({ String? lastResource, bool waitForConnection = false, bool shouldReconnect = true }) async {
-    String? lastResource,
+    if (_connectionState != XmppConnectionState.notConnected && _connectionState != XmppConnectionState.error) {
-    bool waitForConnection = false,
+      _log.fine('Cancelling this connection attempt as one appears to be already running.');
-    bool shouldReconnect = true,
-  }) async {
-    if (_connectionState != XmppConnectionState.notConnected &&
-        _connectionState != XmppConnectionState.error) {
-      _log.fine(
-        'Cancelling this connection attempt as one appears to be already running.',
-      );
       return;
     }
     

packages/moxxmpp/lib/src/events.dart

@@ -188,11 +188,7 @@ class SubscriptionRequestReceivedEvent extends XmppEvent {
 
 /// Triggered when we receive a new or updated avatar
 class AvatarUpdatedEvent extends XmppEvent {
-  AvatarUpdatedEvent({
+  AvatarUpdatedEvent({ required this.jid, required this.base64, required this.hash });
-    required this.jid,
-    required this.base64,
-    required this.hash,
-  });
   final String jid;
   final String base64;
   final String hash;

packages/moxxmpp/lib/src/iq.dart

@@ -5,10 +5,7 @@ import 'package:moxxmpp/src/stanza.dart';
 /// Bounce a stanza if it was not handled by any manager. [conn] is the connection object
 /// to use for sending the stanza. [data] is the StanzaHandlerData of the unhandled
 /// stanza.
-Future<void> handleUnhandledStanza(
+Future<void> handleUnhandledStanza(XmppConnection conn, StanzaHandlerData data) async {
-  XmppConnection conn,
-  StanzaHandlerData data,
-) async {
   if (data.stanza.type != 'error' && data.stanza.type != 'result') {
     final stanza = data.stanza.copyWith(
       to: data.stanza.from,

packages/moxxmpp/lib/src/jid.dart

@@ -18,10 +18,7 @@ class JID {
     } else {
       resourcePart = slashParts.sublist(1).join('/');
 
-      assert(
+      assert(resourcePart.isNotEmpty, 'Resource part cannot be there and empty');
-        resourcePart.isNotEmpty,
-        'Resource part cannot be there and empty',
-      );
     }
 
     final atParts = slashParts.first.split('@');
@@ -37,9 +34,9 @@ class JID {
 
     return JID(
       localPart,
-      domainPart.endsWith('.')
+      domainPart.endsWith('.') ?
-          ? domainPart.substring(0, domainPart.length - 1)
+        domainPart.substring(0, domainPart.length - 1) :
-          : domainPart,
+        domainPart,
       resourcePart,
     );
   }
@@ -93,9 +90,7 @@ class JID {
   @override
   bool operator ==(Object other) {
     if (other is JID) {
-      return other.local == local &&
+      return other.local == local && other.domain == domain && other.resource == resource;
-          other.domain == domain &&
-          other.resource == resource;
     }
 
     return false;

packages/moxxmpp/lib/src/managers/attributes.dart

@@ -22,16 +22,8 @@ class XmppManagerAttributes {
     required this.getConnection,
     required this.getNegotiatorById,
   });
-
   /// Send a stanza whose response can be awaited.
-  final Future<XMLNode> Function(
+  final Future<XMLNode> Function(Stanza stanza, { StanzaFromType addFrom, bool addId, bool awaitable, bool encrypted, bool forceEncryption}) sendStanza;
-    Stanza stanza, {
-    StanzaFromType addFrom,
-    bool addId,
-    bool awaitable,
-    bool encrypted,
-    bool forceEncryption,
-  }) sendStanza;
 
   /// Send a nonza.
   final void Function(XMLNode) sendNonza;
@@ -57,6 +49,5 @@ class XmppManagerAttributes {
   /// Return the [XmppConnection] the manager is registered against.
   final XmppConnection Function() getConnection;
 
-  final T? Function<T extends XmppFeatureNegotiatorBase>(String)
+  final T? Function<T extends XmppFeatureNegotiatorBase>(String) getNegotiatorById;
-      getNegotiatorById;
 }

packages/moxxmpp/lib/src/managers/base.dart

@@ -99,12 +99,15 @@ abstract class XmppManagerBase {
   /// the nonza has been handled by one of the handlers. Resolves to false otherwise.
   Future<bool> runNonzaHandlers(XMLNode nonza) async {
     var handled = false;
-    await Future.forEach(getNonzaHandlers(), (NonzaHandler handler) async {
+    await Future.forEach(
+      getNonzaHandlers(),
+      (NonzaHandler handler) async {
         if (handler.matches(nonza)) {
           handled = true;
           await handler.callback(nonza);
         }
-    });
+      }
+    );
 
     return handled;
   }
@@ -113,8 +116,7 @@ abstract class XmppManagerBase {
   /// for plugins to reset their cache in case of a new stream.
   /// The value only makes sense after receiving a StreamNegotiationsDoneEvent.
   Future<bool> isNewStream() async {
-    final sm =
+    final sm = getAttributes().getManagerById<StreamManagementManager>(smManager);
-        getAttributes().getManagerById<StreamManagementManager>(smManager);
 
     return sm?.streamResumed == false;
   }
@@ -123,15 +125,8 @@ abstract class XmppManagerBase {
   /// children with [children].
   ///
   /// Note that this function currently only accepts IQ stanzas.
-  Future<void> reply(
+  Future<void> reply(StanzaHandlerData data, String type, List<XMLNode> children) async {
-    StanzaHandlerData data,
+    assert(data.stanza.tag == 'iq', 'Reply makes little sense for non-IQ stanzas');
-    String type,
-    List<XMLNode> children,
-  ) async {
-    assert(
-      data.stanza.tag == 'iq',
-      'Reply makes little sense for non-IQ stanzas',
-    );
 
     final stanza = data.stanza.copyWith(
       to: data.stanza.from,

packages/moxxmpp/lib/src/managers/data.dart

@@ -27,7 +27,8 @@ class StanzaHandlerData with _$StanzaHandlerData {
     dynamic cancelReason,
     // The stanza that is being dealt with. SHOULD NOT be overwritten, unless it is absolutely
     // necessary, e.g. with Message Carbons or OMEMO
-    Stanza stanza, {
+    Stanza stanza,
+    {
       // Whether the stanza is retransmitted. Only useful in the context of outgoing
       // stanza handlers. MUST NOT be overwritten.
       @Default(false) bool retransmitted,
@@ -70,5 +71,6 @@ class StanzaHandlerData with _$StanzaHandlerData {
       MessageReactions? messageReactions,
       // The Id of the sticker pack this sticker belongs to
       String? stickerPackId,
-  }) = _StanzaHandlerData;
+    }
+  ) = _StanzaHandlerData;
 }

packages/moxxmpp/lib/src/managers/handlers.dart

@@ -19,8 +19,7 @@ abstract class Handler {
     }
 
     if (nonzaXmlns != null && nonzaTag != null) {
-      matches = (node.attributes['xmlns'] ?? '') == nonzaXmlns! &&
+      matches = (node.attributes['xmlns'] ?? '') == nonzaXmlns! && node.tag == nonzaTag!;
-          node.tag == nonzaTag!;
     }
     
     if (matchStanzas && nonzaTag == null) {
@@ -76,9 +75,7 @@ class StanzaHandler extends Handler {
     } else if (tagXmlns != null) {
       return listContains(
         node.children,
-        (XMLNode node_) =>
+        (XMLNode node_) => node_.attributes.containsKey('xmlns') && node_.attributes['xmlns'] == tagXmlns,
-            node_.attributes.containsKey('xmlns') &&
-            node_.attributes['xmlns'] == tagXmlns,
       );
     }
 
@@ -90,5 +87,4 @@ class StanzaHandler extends Handler {
   }
 }
 
-int stanzaHandlerSortComparator(StanzaHandler a, StanzaHandler b) =>
+int stanzaHandlerSortComparator(StanzaHandler a, StanzaHandler b) => b.priority.compareTo(a.priority);
-    b.priority.compareTo(a.priority);

packages/moxxmpp/lib/src/managers/namespaces.dart

@@ -10,8 +10,7 @@ const pubsubManager = 'org.moxxmpp.pubsubmanager';
 const userAvatarManager = 'org.moxxmpp.useravatarmanager';
 const stableIdManager = 'org.moxxmpp.stableidmanager';
 const simsManager = 'org.moxxmpp.simsmanager';
-const messageDeliveryReceiptManager =
+const messageDeliveryReceiptManager = 'org.moxxmpp.messagedeliveryreceiptmanager';
-    'org.moxxmpp.messagedeliveryreceiptmanager';
 const chatMarkerManager = 'org.moxxmpp.chatmarkermanager';
 const oobManager = 'org.moxxmpp.oobmanager';
 const sfsManager = 'org.moxxmpp.sfsmanager';
@@ -20,8 +19,7 @@ const blockingManager = 'org.moxxmpp.blockingmanager';
 const httpFileUploadManager = 'org.moxxmpp.httpfileuploadmanager';
 const chatStateManager = 'org.moxxmpp.chatstatemanager';
 const pingManager = 'org.moxxmpp.ping';
-const fileUploadNotificationManager =
+const fileUploadNotificationManager = 'org.moxxmpp.fileuploadnotificationmanager';
-    'org.moxxmpp.fileuploadnotificationmanager';
 const omemoManager = 'org.moxxmpp.omemomanager';
 const emeManager = 'org.moxxmpp.ememanager';
 const cryptographicHashManager = 'org.moxxmpp.cryptographichashmanager';

packages/moxxmpp/lib/src/managers/priorities.dart

@@ -1 +0,0 @@
-

packages/moxxmpp/lib/src/message.dart

@@ -90,21 +90,16 @@ class MessageManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza _, StanzaHandlerData state) async {
-    Stanza _,
-    StanzaHandlerData state,
-  ) async {
     final message = state.stanza;
     final body = message.firstTag('body');
 
     final hints = List<MessageProcessingHint>.empty(growable: true);
-    for (final element
+    for (final element in message.findTagsByXmlns(messageProcessingHintsXmlns)) {
-        in message.findTagsByXmlns(messageProcessingHintsXmlns)) {
       hints.add(messageProcessingHintFromXml(element)); 
     }
     
-    getAttributes().sendEvent(
+    getAttributes().sendEvent(MessageEvent(
-      MessageEvent(
       body: body != null ? body.innerText() : '',
       fromJid: JID.fromString(message.attributes['from']! as String),
       toJid: JID.fromString(message.attributes['to']! as String),
@@ -126,12 +121,13 @@ class MessageManager extends XmppManagerBase {
       messageRetraction: state.messageRetraction,
       messageCorrectionId: state.lastMessageCorrectionSid,
       messageReactions: state.messageReactions,
-        messageProcessingHints: hints.isEmpty ? null : hints,
+      messageProcessingHints: hints.isEmpty ?
+        null :
+        hints,
       stickerPackId: state.stickerPackId,
       other: state.other,
       error: StanzaError.fromStanza(message),
-      ),
+    ),);
-    );
 
     return state.copyWith(done: true);
   }
@@ -143,10 +139,7 @@ class MessageManager extends XmppManagerBase {
   /// child in the message stanza and set its id to originId.
   void sendMessage(MessageDetails details) {
     assert(
-      implies(
+      implies(details.quoteBody != null, details.quoteFrom != null && details.quoteId != null),
-        details.quoteBody != null,
-        details.quoteFrom != null && details.quoteId != null,
-      ),
       'When quoting a message, then quoteFrom and quoteId must also be non-null',
     );
 
@@ -168,14 +161,19 @@ class MessageManager extends XmppManagerBase {
           XMLNode.xmlns(
             tag: 'reply',
             xmlns: replyXmlns,
-            attributes: {'to': details.quoteFrom!, 'id': details.quoteId!},
+            attributes: {
+              'to': details.quoteFrom!,
+              'id': details.quoteId!
+            },
           ),
         )
         ..addChild(
           XMLNode.xmlns(
             tag: 'fallback',
             xmlns: fallbackXmlns,
-            attributes: {'for': replyXmlns},
+            attributes: {
+              'for': replyXmlns
+            },
             children: [
               XMLNode(
                 tag: 'body',
@@ -222,8 +220,7 @@ class MessageManager extends XmppManagerBase {
       stanza.addChild(details.sfs!.toXML());
 
       final source = details.sfs!.sources.first;
-      if (source is StatelessFileSharingUrlSource &&
+      if (source is StatelessFileSharingUrlSource && details.setOOBFallbackBody) {
-          details.setOOBFallbackBody) {
         // SFS recommends OOB as a fallback
         stanza.addChild(constructOOBNode(OOBData(url: source.url)));
       }
@@ -232,10 +229,7 @@ class MessageManager extends XmppManagerBase {
     if (details.chatState != null) {
       stanza.addChild(
         // TODO(Unknown): Move this into xep_0085.dart
-        XMLNode.xmlns(
+        XMLNode.xmlns(tag: chatStateToString(details.chatState!), xmlns: chatStateXmlns),
-          tag: chatStateToString(details.chatState!),
-          xmlns: chatStateXmlns,
-        ),
       );
     }
 

packages/moxxmpp/lib/src/namespaces.dart

@@ -28,11 +28,9 @@ const vCardTempUpdate = 'vcard-temp:x:update';
 const pubsubXmlns = 'http://jabber.org/protocol/pubsub';
 const pubsubEventXmlns = 'http://jabber.org/protocol/pubsub#event';
 const pubsubOwnerXmlns = 'http://jabber.org/protocol/pubsub#owner';
-const pubsubPublishOptionsXmlns =
+const pubsubPublishOptionsXmlns = 'http://jabber.org/protocol/pubsub#publish-options';
-    'http://jabber.org/protocol/pubsub#publish-options';
 const pubsubNodeConfigMax = 'http://jabber.org/protocol/pubsub#config-node-max';
-const pubsubNodeConfigMultiItems =
+const pubsubNodeConfigMultiItems = 'http://jabber.org/protocol/pubsub#multi-items';
-    'http://jabber.org/protocol/pubsub#multi-items';
 
 // XEP-0066
 const oobDataXmlns = 'jabber:x:oob';
@@ -139,10 +137,8 @@ const sfsXmlns = 'urn:xmpp:sfs:0';
 
 // XEP-0448
 const sfsEncryptionXmlns = 'urn:xmpp:esfs:0';
-const sfsEncryptionAes128GcmNoPaddingXmlns =
+const sfsEncryptionAes128GcmNoPaddingXmlns = 'urn:xmpp:ciphers:aes-128-gcm-nopadding:0';
-    'urn:xmpp:ciphers:aes-128-gcm-nopadding:0';
+const sfsEncryptionAes256GcmNoPaddingXmlns = 'urn:xmpp:ciphers:aes-256-gcm-nopadding:0';
-const sfsEncryptionAes256GcmNoPaddingXmlns =
-    'urn:xmpp:ciphers:aes-256-gcm-nopadding:0';
 const sfsEncryptionAes256CbcPkcs7Xmlns = 'urn:xmpp:ciphers:aes-256-cbc-pkcs7:0';
 
 // XEP-0449

packages/moxxmpp/lib/src/negotiators/manager.dart

@@ -1 +0,0 @@
-

packages/moxxmpp/lib/src/negotiators/negotiator.dart

@@ -35,41 +35,28 @@ class NegotiatorAttributes {
     this.getSocket,
     this.isAuthenticated,
   );
-
   /// Sends the nonza nonza and optionally redacts it in logs if redact is not null.
   final void Function(XMLNode nonza, {String? redact}) sendNonza;
-
   /// Returns the connection settings.
   final ConnectionSettings Function() getConnectionSettings;
-
   /// Send an event event to the connection's event bus
   final Future<void> Function(XmppEvent event) sendEvent;
-
   /// Returns the negotiator with id id of the connection or null.
-  final T? Function<T extends XmppFeatureNegotiatorBase>(String)
+  final T? Function<T extends XmppFeatureNegotiatorBase>(String) getNegotiatorById;
-      getNegotiatorById;
-
   /// Returns the manager with id id of the connection or null.
   final T? Function<T extends XmppManagerBase>(String) getManagerById;
-
   /// Returns the full JID of the current account
   final JID Function() getFullJID;
-
   /// Returns the socket the negotiator is attached to
   final BaseSocketWrapper Function() getSocket;
-
   /// Returns true if the stream is authenticated. Returns false if not.
   final bool Function() isAuthenticated;
 }
 
 abstract class XmppFeatureNegotiatorBase {
-  XmppFeatureNegotiatorBase(
-    this.priority,
-    this.sendStreamHeaderWhenDone,
-    this.negotiatingXmlns,
-    this.id,
-  ) : state = NegotiatorState.ready;
 
+  XmppFeatureNegotiatorBase(this.priority, this.sendStreamHeaderWhenDone, this.negotiatingXmlns, this.id)
+    : state = NegotiatorState.ready;
   /// The priority regarding other negotiators. The higher, the earlier will the
   /// negotiator be used
   final int priority;
@@ -100,8 +87,7 @@ abstract class XmppFeatureNegotiatorBase {
     return firstWhereOrNull(
       features,
       (XMLNode feature) => feature.attributes['xmlns'] == negotiatingXmlns,
-        ) !=
+    ) != null;
-        null;
   }
 
   /// Called with the currently received nonza [nonza] when the negotiator is active.

packages/moxxmpp/lib/src/negotiators/resource_binding.dart

@@ -16,8 +16,7 @@ class ResourceBindingFailedError extends NegotiatorError {
 /// A negotiator that implements resource binding against a random server-provided
 /// resource.
 class ResourceBindingNegotiator extends XmppFeatureNegotiatorBase {
-  ResourceBindingNegotiator()
+  ResourceBindingNegotiator() : super(0, false, bindXmlns, resourceBindingNegotiator);
-      : super(0, false, bindXmlns, resourceBindingNegotiator);
 
   /// Flag indicating the state of the negotiator:
   /// - True: We sent a binding request
@@ -28,18 +27,14 @@ class ResourceBindingNegotiator extends XmppFeatureNegotiatorBase {
   bool matchesFeature(List<XMLNode> features) {
     final sm = attributes.getManagerById<StreamManagementManager>(smManager);
     if (sm != null) {
-      return super.matchesFeature(features) &&
+      return super.matchesFeature(features) && !sm.streamResumed && attributes.isAuthenticated();
-          !sm.streamResumed &&
-          attributes.isAuthenticated();
     }
 
     return super.matchesFeature(features) && attributes.isAuthenticated();
   }
   
   @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
-    XMLNode nonza,
-  ) async {
     if (!_requestSent) {
       final stanza = XMLNode.xmlns(
         tag: 'iq',
@@ -68,8 +63,7 @@ class ResourceBindingNegotiator extends XmppFeatureNegotiatorBase {
       final jid = bind.firstTag('jid')!;
       final resource = jid.innerText().split('/')[1];
 
-      await attributes
+      await attributes.sendEvent(ResourceBindingSuccessEvent(resource: resource));
-          .sendEvent(ResourceBindingSuccessEvent(resource: resource));
       return const Result(NegotiatorState.done);
     }
   }

packages/moxxmpp/lib/src/negotiators/sasl/errors.dart

@@ -12,12 +12,9 @@ abstract class SaslError extends NegotiatorError {
     }
 
     switch (error?.tag) {
-      case 'credentials-expired':
+      case 'credentials-expired': return SaslCredentialsExpiredError();
-        return SaslCredentialsExpiredError();
+      case 'not-authorized': return SaslNotAuthorizedError();
-      case 'not-authorized':
+      case 'account-disabled': return SaslAccountDisabledError();
-        return SaslNotAuthorizedError();
-      case 'account-disabled':
-        return SaslAccountDisabledError();
     }
 
     return SaslUnspecifiedError();

packages/moxxmpp/lib/src/negotiators/sasl/kv.dart

@@ -1,4 +1,7 @@
-enum ParserState { variableName, variableValue }
+enum ParserState {
+  variableName,
+  variableValue
+}
 
 /// Parse a string like "n,,n=user,r=fyko+d2lbbFgONRv9qkxdawL" into
 /// { "n": "user", "r": "fyko+d2lbbFgONRv9qkxdawL"}.
@@ -11,8 +14,7 @@ Map<String, String> parseKeyValue(String keyValueString) {
   for (var i = 0; i < keyValueString.length; i++) {
     final char = keyValueString[i];
     switch (state) {
-      case ParserState.variableName:
+      case ParserState.variableName: {
-        {
         if (char == '=') {
           state = ParserState.variableValue; 
         } else if (char == ',') {
@@ -22,8 +24,7 @@ Map<String, String> parseKeyValue(String keyValueString) {
         }
       }
       break;
-      case ParserState.variableValue:
+      case ParserState.variableValue: {
-        {
         if (char == ',' || i == keyValueString.length - 1) {
           if (char != ',') {
             value += char;

packages/moxxmpp/lib/src/negotiators/sasl/negotiator.dart

@@ -4,9 +4,8 @@ import 'package:moxxmpp/src/negotiators/negotiator.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 
 abstract class SaslNegotiator extends XmppFeatureNegotiatorBase {
-  SaslNegotiator(int priority, String id, this.mechanismName)
-      : super(priority, true, saslXmlns, id);
 
+  SaslNegotiator(int priority, String id, this.mechanismName) : super(priority, true, saslXmlns, id);
   /// The name inside the <mechanism /> element
   final String mechanismName;
   
@@ -23,7 +22,6 @@ abstract class SaslNegotiator extends XmppFeatureNegotiatorBase {
     return firstWhereOrNull(
       mechanisms.children,
       (XMLNode mechanism) => mechanism.text == mechanismName,
-        ) !=
+    ) != null;
-        null;
   }
 }

packages/moxxmpp/lib/src/negotiators/sasl/nonza.dart

@@ -2,8 +2,7 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 
 class SaslAuthNonza extends XMLNode {
-  SaslAuthNonza(String mechanism, String body)
+  SaslAuthNonza(String mechanism, String body) : super(
-      : super(
     tag: 'auth',
     attributes: <String, String>{
       'xmlns': saslXmlns,

packages/moxxmpp/lib/src/negotiators/sasl/plain.dart

@@ -10,10 +10,8 @@ import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
 
 class SaslPlainAuthNonza extends SaslAuthNonza {
-  SaslPlainAuthNonza(String username, String password)
+  SaslPlainAuthNonza(String username, String password) : super(
-      : super(
+    'PLAIN', base64.encode(utf8.encode('\u0000$username\u0000$password')),
-          'PLAIN',
-          base64.encode(utf8.encode('\u0000$username\u0000$password')),
   );
 }
 
@@ -32,9 +30,7 @@ class SaslPlainNegotiator extends SaslNegotiator {
     
     if (super.matchesFeature(features)) {
       if (!attributes.getSocket().isSecure()) {
-        _log.warning(
+        _log.warning('Refusing to match SASL feature due to unsecured connection');
-          'Refusing to match SASL feature due to unsecured connection',
-        );
         return false;
       }
 
@@ -45,9 +41,7 @@ class SaslPlainNegotiator extends SaslNegotiator {
   }
 
   @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
-    XMLNode nonza,
-  ) async {
     if (!_authSent) {
       final settings = attributes.getConnectionSettings();
       attributes.sendNonza(

packages/moxxmpp/lib/src/negotiators/sasl/scram.dart

@@ -17,30 +17,28 @@ import 'package:saslprep/saslprep.dart';
 
 // NOTE: Inspired by https://github.com/vukoye/xmpp_dart/blob/3b1a0588562b9e591488c99d834088391840911d/lib/src/features/sasl/ScramSaslHandler.dart
 
-enum ScramHashType { sha1, sha256, sha512 }
+enum ScramHashType {
+  sha1,
+  sha256,
+  sha512
+}
 
 HashAlgorithm hashFromType(ScramHashType type) {
   switch (type) {
-    case ScramHashType.sha1:
+    case ScramHashType.sha1: return Sha1();
-      return Sha1();
+    case ScramHashType.sha256: return Sha256();
-    case ScramHashType.sha256:
+    case ScramHashType.sha512: return Sha512();
-      return Sha256();
-    case ScramHashType.sha512:
-      return Sha512();
   }
 }
 
 int pbkdfBitsFromHash(ScramHashType type) {
   switch (type) {
     // NOTE: SHA1 is 20 octets long => 20 octets * 8 bits/octet
-    case ScramHashType.sha1:
+    case ScramHashType.sha1: return 160;
-      return 160;
     // NOTE: SHA256 is 32 octets long => 32 octets * 8 bits/octet
-    case ScramHashType.sha256:
+    case ScramHashType.sha256: return 256;
-      return 256;
     // NOTE: SHA512 is 64 octets long => 64 octets * 8 bits/octet
-    case ScramHashType.sha512:
+    case ScramHashType.sha512: return 512;
-      return 512;
   }
 }
 
@@ -50,39 +48,30 @@ const scramSha512Mechanism = 'SCRAM-SHA-512';
 
 String mechanismNameFromType(ScramHashType type) {
   switch (type) {
-    case ScramHashType.sha1:
+    case ScramHashType.sha1: return scramSha1Mechanism;
-      return scramSha1Mechanism;
+    case ScramHashType.sha256: return scramSha256Mechanism;
-    case ScramHashType.sha256:
+    case ScramHashType.sha512: return scramSha512Mechanism;
-      return scramSha256Mechanism;
-    case ScramHashType.sha512:
-      return scramSha512Mechanism;
   }
 }
 
 String namespaceFromType(ScramHashType type) {
   switch (type) {
-    case ScramHashType.sha1:
+    case ScramHashType.sha1: return saslScramSha1Negotiator;
-      return saslScramSha1Negotiator;
+    case ScramHashType.sha256: return saslScramSha256Negotiator;
-    case ScramHashType.sha256:
+    case ScramHashType.sha512: return saslScramSha512Negotiator;
-      return saslScramSha256Negotiator;
-    case ScramHashType.sha512:
-      return saslScramSha512Negotiator;
   }
 }
 
 class SaslScramAuthNonza extends SaslAuthNonza {
   // This subclassing makes less sense here, but this is since the auth nonza here
   // requires knowledge of the inner state of the Negotiator.
-  SaslScramAuthNonza({required ScramHashType type, required String body})
+  SaslScramAuthNonza({ required ScramHashType type, required String body }) : super(
-      : super(
+    mechanismNameFromType(type), body,
-          mechanismNameFromType(type),
-          body,
   );
 }
 
 class SaslScramResponseNonza extends XMLNode {
-  SaslScramResponseNonza({required String body})
+  SaslScramResponseNonza({ required String body }) : super(
-      : super(
     tag: 'response',
     attributes: <String, String>{
       'xmlns': saslXmlns,
@@ -91,7 +80,12 @@ class SaslScramResponseNonza extends XMLNode {
   );
 }
 
-enum ScramState { preSent, initialMessageSent, challengeResponseSent, error }
+enum ScramState {
+  preSent,
+  initialMessageSent,
+  challengeResponseSent,
+  error
+}
 
 const gs2Header = 'n,,';
 
@@ -102,16 +96,12 @@ class SaslScramNegotiator extends SaslNegotiator {
     this.initialMessageNoGS2,
     this.clientNonce,
     this.hashType,
-  )   : _hash = hashFromType(hashType),
+  ) :
+    _hash = hashFromType(hashType),
     _serverSignature = '',
     _scramState = ScramState.preSent,
-        _log =
+    _log = Logger('SaslScramNegotiator(${mechanismNameFromType(hashType)})'),
-            Logger('SaslScramNegotiator(${mechanismNameFromType(hashType)})'),
+    super(priority, namespaceFromType(hashType), mechanismNameFromType(hashType));
-        super(
-          priority,
-          namespaceFromType(hashType),
-          mechanismNameFromType(hashType),
-        );
   String? clientNonce;
   String initialMessageNoGS2;
   final ScramHashType hashType;
@@ -132,9 +122,7 @@ class SaslScramNegotiator extends SaslNegotiator {
 
     final saltedPasswordRaw = await pbkdf2.deriveKey(
       secretKey: SecretKey(
-        utf8.encode(
+        utf8.encode(Saslprep.saslprep(attributes.getConnectionSettings().password)),
-          Saslprep.saslprep(attributes.getConnectionSettings().password),
-        ),
       ),
       nonce: base64.decode(salt),
     );
@@ -143,46 +131,32 @@ class SaslScramNegotiator extends SaslNegotiator {
 
   Future<List<int>> calculateClientKey(List<int> saltedPassword) async {
     return (await Hmac(_hash).calculateMac(
-      utf8.encode('Client Key'),
+        utf8.encode('Client Key'), secretKey: SecretKey(saltedPassword),
-      secretKey: SecretKey(saltedPassword),
+    )).bytes;
-    ))
-        .bytes;
   }
 
-  Future<List<int>> calculateClientSignature(
+  Future<List<int>> calculateClientSignature(String authMessage, List<int> storedKey) async {
-    String authMessage,
-    List<int> storedKey,
-  ) async {
     return (await Hmac(_hash).calculateMac(
         utf8.encode(authMessage),
         secretKey: SecretKey(storedKey),
-    ))
+    )).bytes;
-        .bytes;
   }
 
   Future<List<int>> calculateServerKey(List<int> saltedPassword) async {
     return (await Hmac(_hash).calculateMac(
         utf8.encode('Server Key'),
         secretKey: SecretKey(saltedPassword),
-    ))
+    )).bytes;
-        .bytes;
   }
 
-  Future<List<int>> calculateServerSignature(
+  Future<List<int>> calculateServerSignature(String authMessage, List<int> serverKey) async {
-    String authMessage,
-    List<int> serverKey,
-  ) async {
     return (await Hmac(_hash).calculateMac(
         utf8.encode(authMessage),
         secretKey: SecretKey(serverKey),
-    ))
+    )).bytes;
-        .bytes;
   }
 
-  List<int> calculateClientProof(
+  List<int> calculateClientProof(List<int> clientKey, List<int> clientSignature) {
-    List<int> clientKey,
-    List<int> clientSignature,
-  ) {
     final clientProof = List<int>.filled(clientKey.length, 0);
     for (var i = 0; i < clientKey.length; i++) {
       clientProof[i] = clientKey[i] ^ clientSignature[i];
@@ -196,20 +170,14 @@ class SaslScramNegotiator extends SaslNegotiator {
     final challenge = parseKeyValue(challengeString);
     final clientFinalMessageBare = 'c=biws,r=${challenge['r']!}';
     
-    final saltedPassword = await calculateSaltedPassword(
+    final saltedPassword = await calculateSaltedPassword(challenge['s']!, int.parse(challenge['i']!));
-      challenge['s']!,
-      int.parse(challenge['i']!),
-    );
     final clientKey = await calculateClientKey(saltedPassword);
     final storedKey = (await _hash.hash(clientKey)).bytes;
-    final authMessage =
+    final authMessage = '$initialMessageNoGS2,$challengeString,$clientFinalMessageBare';
-        '$initialMessageNoGS2,$challengeString,$clientFinalMessageBare';
+    final clientSignature = await calculateClientSignature(authMessage, storedKey);
-    final clientSignature =
-        await calculateClientSignature(authMessage, storedKey);
     final clientProof = calculateClientProof(clientKey, clientSignature);
     final serverKey = await calculateServerKey(saltedPassword);
-    _serverSignature =
+    _serverSignature = base64.encode(await calculateServerSignature(authMessage, serverKey));
-        base64.encode(await calculateServerSignature(authMessage, serverKey));
 
     return '$clientFinalMessageBare,p=${base64.encode(clientProof)}';
   }
@@ -218,9 +186,7 @@ class SaslScramNegotiator extends SaslNegotiator {
   bool matchesFeature(List<XMLNode> features) {
     if (super.matchesFeature(features)) {
       if (!attributes.getSocket().isSecure()) {
-        _log.warning(
+        _log.warning('Refusing to match SASL feature due to unsecured connection');
-          'Refusing to match SASL feature due to unsecured connection',
-        );
         return false;
       }
 
@@ -231,27 +197,18 @@ class SaslScramNegotiator extends SaslNegotiator {
   }
   
   @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
-    XMLNode nonza,
-  ) async {
     switch (_scramState) {
       case ScramState.preSent:
         if (clientNonce == null || clientNonce == '') {
-          clientNonce = randomAlphaNumeric(
+          clientNonce = randomAlphaNumeric(40, provider: CoreRandomProvider.from(Random.secure()));
-            40,
-            provider: CoreRandomProvider.from(Random.secure()),
-          );
         }
         
-        initialMessageNoGS2 =
+        initialMessageNoGS2 = 'n=${attributes.getConnectionSettings().jid.local},r=$clientNonce';
-            'n=${attributes.getConnectionSettings().jid.local},r=$clientNonce';
 
         _scramState = ScramState.initialMessageSent;
         attributes.sendNonza(
-          SaslScramAuthNonza(
+          SaslScramAuthNonza(body: base64.encode(utf8.encode(gs2Header + initialMessageNoGS2)), type: hashType),
-            body: base64.encode(utf8.encode(gs2Header + initialMessageNoGS2)),
-            type: hashType,
-          ),
           redact: SaslScramAuthNonza(body: '******', type: hashType).toXml(),
         );
         return const Result(NegotiatorState.ready);
@@ -287,8 +244,7 @@ class SaslScramNegotiator extends SaslNegotiator {
         }
 
         // NOTE: This assumes that the string is always "v=..." and contains no other parameters
-        final signature =
+        final signature = parseKeyValue(utf8.decode(base64.decode(nonza.innerText())));
-            parseKeyValue(utf8.decode(base64.decode(nonza.innerText())));
         if (signature['v']! != _serverSignature) {
           // TODO(Unknown): Notify of a signature mismatch
           //final error = nonza.children.first.tag;

packages/moxxmpp/lib/src/negotiators/starttls.dart

@@ -5,7 +5,10 @@ import 'package:moxxmpp/src/negotiators/negotiator.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
 
-enum _StartTlsState { ready, requested }
+enum _StartTlsState {
+  ready,
+  requested
+}
 
 class StartTLSFailedError extends NegotiatorError {
   @override
@@ -13,8 +16,7 @@ class StartTLSFailedError extends NegotiatorError {
 }
 
 class StartTLSNonza extends XMLNode {
-  StartTLSNonza()
+  StartTLSNonza() : super.xmlns(
-      : super.xmlns(
     tag: 'starttls',
     xmlns: startTlsXmlns,
   );
@@ -31,9 +33,7 @@ class StartTlsNegotiator extends XmppFeatureNegotiatorBase {
   final Logger _log = Logger('StartTlsNegotiator');
 
   @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
-    XMLNode nonza,
-  ) async {
     switch (_state) {
       case _StartTlsState.ready:
         _log.fine('StartTLS is available. Performing StartTLS upgrade...');
@@ -41,15 +41,13 @@ class StartTlsNegotiator extends XmppFeatureNegotiatorBase {
         attributes.sendNonza(StartTLSNonza());
         return const Result(NegotiatorState.ready);
       case _StartTlsState.requested:
-        if (nonza.tag != 'proceed' ||
+        if (nonza.tag != 'proceed' || nonza.attributes['xmlns'] != startTlsXmlns) {
-            nonza.attributes['xmlns'] != startTlsXmlns) {
           _log.severe('Failed to perform StartTLS negotiation');
           return Result(StartTLSFailedError());
         }
 
         _log.fine('Securing socket');
-        final result = await attributes
+        final result = await attributes.getSocket()
-            .getSocket()
           .secure(attributes.getConnectionSettings().jid.domain);
         if (!result) {
           _log.severe('Failed to secure stream');

packages/moxxmpp/lib/src/ping.dart

@@ -10,9 +10,7 @@ class PingManager extends XmppManagerBase {
   Future<bool> isSupported() async => true;
   
   void _logWarning() {
-    logger.warning(
+    logger.warning('Cannot send keepalives as SM is not available, the socket disallows whitespace pings and does not manage its own keepalives. Cannot guarantee that the connection survives.');
-      'Cannot send keepalives as SM is not available, the socket disallows whitespace pings and does not manage its own keepalives. Cannot guarantee that the connection survives.',
-    );
   }
   
   @override
@@ -27,17 +25,13 @@ class PingManager extends XmppManagerBase {
         return;
       }
       
-      final stream =
+      final stream = attrs.getManagerById(smManager) as StreamManagementManager?;
-          attrs.getManagerById(smManager) as StreamManagementManager?;
       if (stream != null) {
-        if (stream
+        if (stream.isStreamManagementEnabled() /*&& stream.getUnackedStanzaCount() > 0*/) {
-            .isStreamManagementEnabled() /*&& stream.getUnackedStanzaCount() > 0*/) {
           logger.finest('Sending an ack ping as Stream Management is enabled');
           stream.sendAckRequestPing();
         } else if (attrs.getSocket().whitespacePingAllowed()) {
-          logger.finest(
+          logger.finest('Sending a whitespace ping as Stream Management is not enabled');
-            'Sending a whitespace ping as Stream Management is not enabled',
-          );
           attrs.getConnection().sendWhitespacePing();
         } else {
           _logWarning();

packages/moxxmpp/lib/src/presence.dart

@@ -20,8 +20,7 @@ class PresenceManager extends XmppManagerBase {
   PresenceManager() : super(presenceManager);
 
   /// The list of pre-send callbacks.
-  final List<PresencePreSendCallback> _presenceCallbacks =
+  final List<PresencePreSendCallback> _presenceCallbacks = List.empty(growable: true);
-      List.empty(growable: true);
 
   @override
   List<StanzaHandler> getIncomingStanzaHandlers() => [
@@ -42,32 +41,23 @@ class PresenceManager extends XmppManagerBase {
     _presenceCallbacks.add(callback);
   }
   
-  Future<StanzaHandlerData> _onPresence(
+  Future<StanzaHandlerData> _onPresence(Stanza presence, StanzaHandlerData state) async {
-    Stanza presence,
-    StanzaHandlerData state,
-  ) async {
     final attrs = getAttributes();
     switch (presence.type) {
       case 'subscribe':
-      case 'subscribed':
+      case 'subscribed': {
-        {
         attrs.sendEvent(
-            SubscriptionRequestReceivedEvent(
+          SubscriptionRequestReceivedEvent(from: JID.fromString(presence.from!)),
-              from: JID.fromString(presence.from!),
-            ),
         );
         return state.copyWith(done: true);
       }
-      default:
+      default: break;
-        break;
     }
 
     if (presence.from != null) {
       logger.finest("Received presence from '${presence.from}'");
 
-      getAttributes().sendEvent(
+      getAttributes().sendEvent(PresenceReceivedEvent(JID.fromString(presence.from!), presence));
-        PresenceReceivedEvent(JID.fromString(presence.from!), presence),
-      );
       return state.copyWith(done: true);
     } 
 

packages/moxxmpp/lib/src/reconnect.dart

@@ -37,10 +37,7 @@ abstract class ReconnectionPolicy {
   final Lock shouldReconnectLock = Lock();
   
   /// Called by XmppConnection to register the policy.
-  void register(
+  void register(PerformReconnectFunction performReconnect, ConnectionLostCallback triggerConnectionLost) {
-    PerformReconnectFunction performReconnect,
-    ConnectionLostCallback triggerConnectionLost,
-  ) {
     this.performReconnect = performReconnect;
     this.triggerConnectionLost = triggerConnectionLost;
 
@@ -64,8 +61,7 @@ abstract class ReconnectionPolicy {
 
   /// Set whether a reconnection attempt should be made.
   Future<void> setShouldReconnect(bool value) async {
-    return shouldReconnectLock
+    return shouldReconnectLock.synchronized(() => _shouldAttemptReconnection = value);
-        .synchronized(() => _shouldAttemptReconnection = value);
   }
 
   /// Returns true if the manager is currently triggering a reconnection. If not, returns
@@ -81,6 +77,7 @@ abstract class ReconnectionPolicy {
       isReconnecting = value;
     });
   }
+
 }
 
 /// A simple reconnection strategy: Make the reconnection delays exponentially longer
@@ -90,10 +87,7 @@ class RandomBackoffReconnectionPolicy extends ReconnectionPolicy {
   RandomBackoffReconnectionPolicy(
     this._minBackoffTime,
     this._maxBackoffTime,
-  )   : assert(
+  ) : assert(_minBackoffTime < _maxBackoffTime, '_minBackoffTime must be smaller than _maxBackoffTime'),
-          _minBackoffTime < _maxBackoffTime,
-          '_minBackoffTime must be smaller than _maxBackoffTime',
-        ),
       super();
 
   /// The maximum time in seconds that a backoff should be.
@@ -119,16 +113,12 @@ class RandomBackoffReconnectionPolicy extends ReconnectionPolicy {
     await lock.synchronized(() async {
       _log.fine('Lock aquired');
       if (!(await getShouldReconnect())) {
-        _log.fine(
+        _log.fine('Backoff timer expired but getShouldReconnect() returned false');
-          'Backoff timer expired but getShouldReconnect() returned false',
-        );
         return;
       }
 
       if (isReconnecting) {
-        _log.fine(
+        _log.fine('Backoff timer expired but a reconnection is running, so doing nothing.');
-          'Backoff timer expired but a reconnection is running, so doing nothing.',
-        );
         return;
       }
 
@@ -165,14 +155,11 @@ class RandomBackoffReconnectionPolicy extends ReconnectionPolicy {
       return _timer == null;
     });
     if (!shouldContinue) {
-      _log.finest(
+      _log.finest('_onFailure: Not backing off since _timer is already running');
-        '_onFailure: Not backing off since _timer is already running',
-      );
       return;
     }
 
-    final seconds =
+    final seconds = Random().nextInt(_maxBackoffTime - _minBackoffTime) + _minBackoffTime;
-        Random().nextInt(_maxBackoffTime - _minBackoffTime) + _minBackoffTime;
     _log.finest('Failure occured. Starting random backoff with ${seconds}s');
     _timer?.cancel();
 

packages/moxxmpp/lib/src/roster/roster.dart

@@ -18,13 +18,7 @@ import 'package:moxxmpp/src/types/result.dart';
 
 @immutable
 class XmppRosterItem {
-  const XmppRosterItem({
+  const XmppRosterItem({ required this.jid, required this.subscription, this.ask, this.name, this.groups = const [] });
-    required this.jid,
-    required this.subscription,
-    this.ask,
-    this.name,
-    this.groups = const [],
-  });
   final String jid;
   final String? name;
   final String subscription;
@@ -42,12 +36,7 @@ class XmppRosterItem {
   }
 
   @override
-  int get hashCode =>
+  int get hashCode => jid.hashCode ^ name.hashCode ^ subscription.hashCode ^ ask.hashCode ^ groups.hashCode;
-      jid.hashCode ^
-      name.hashCode ^
-      subscription.hashCode ^
-      ask.hashCode ^
-      groups.hashCode;
   
   @override
   String toString() {
@@ -60,7 +49,11 @@ class XmppRosterItem {
   }
 }
 
-enum RosterRemovalResult { okay, error, itemNotFound }
+enum RosterRemovalResult {
+  okay,
+  error,
+  itemNotFound
+}
 
 class RosterRequestResult {
   RosterRequestResult(this.items, this.ver);
@@ -76,18 +69,14 @@ class RosterPushResult {
 
 /// A Stub feature negotiator for finding out whether roster versioning is supported.
 class RosterFeatureNegotiator extends XmppFeatureNegotiatorBase {
-  RosterFeatureNegotiator()
+  RosterFeatureNegotiator() : _supported = false, super(11, false, rosterVersioningXmlns, rosterNegotiator);
-      : _supported = false,
-        super(11, false, rosterVersioningXmlns, rosterNegotiator);
 
   /// True if rosterVersioning is supported. False otherwise.
   bool _supported;
   bool get isSupported => _supported;
   
   @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
-    XMLNode nonza,
-  ) async {
     // negotiate is only called when the negotiator matched, meaning the server
     // advertises roster versioning.
     _supported = true;
@@ -128,10 +117,7 @@ class RosterManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true; 
 
-  Future<StanzaHandlerData> _onRosterPush(
+  Future<StanzaHandlerData> _onRosterPush(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     final attrs = getAttributes();
     final from = stanza.attributes['from'] as String?;
     final selfJid = attrs.getConnectionSettings().jid;
@@ -142,9 +128,7 @@ class RosterManager extends XmppManagerBase {
     // - empty, i.e. not set
     // - a full JID of our own
     if (from != null && JID.fromString(from).toBare() != selfJid) {
-      logger.warning(
+      logger.warning('Roster push invalid! Unexpected from attribute: ${stanza.toXml()}');
-        'Roster push invalid! Unexpected from attribute: ${stanza.toXml()}',
-      );
       return state.copyWith(done: true);
     }
 
@@ -182,32 +166,23 @@ class RosterManager extends XmppManagerBase {
 
   /// Shared code between requesting rosters without and with roster versioning, if
   /// the server deems a regular roster response more efficient than n roster pushes.
-  Future<Result<RosterRequestResult, RosterError>> _handleRosterResponse(
+  Future<Result<RosterRequestResult, RosterError>> _handleRosterResponse(XMLNode? query) async {
-    XMLNode? query,
-  ) async {
     final List<XmppRosterItem> items;
     String? rosterVersion;
     if (query != null) {
-      items = query.children
+      items = query.children.map(
-          .map(
         (item) => XmppRosterItem(
           name: item.attributes['name'] as String?,
           jid: item.attributes['jid']! as String,
           subscription: item.attributes['subscription']! as String,
           ask: item.attributes['ask'] as String?,
-              groups: item
+          groups: item.findTags('group').map((groupNode) => groupNode.innerText()).toList(),
-                  .findTags('group')
-                  .map((groupNode) => groupNode.innerText())
-                  .toList(),
         ),
-          )
+      ).toList();
-          .toList();
 
       rosterVersion = query.attributes['ver'] as String?;
     } else {
-      logger.warning(
+      logger.warning('Server response to roster request without roster versioning does not contain a <query /> element, while the type is not error. This violates RFC6121');
-        'Server response to roster request without roster versioning does not contain a <query /> element, while the type is not error. This violates RFC6121',
-      );
       return Result(NoQueryError());
     }
 
@@ -255,8 +230,7 @@ class RosterManager extends XmppManagerBase {
 
   /// Requests a series of roster pushes according to RFC6121. Requires that the server
   /// advertises urn:xmpp:features:rosterver in the stream features.
-  Future<Result<RosterRequestResult?, RosterError>>
+  Future<Result<RosterRequestResult?, RosterError>> requestRosterPushes() async {
-      requestRosterPushes() async {
     final attrs = getAttributes();
     final result = await attrs.sendStanza(
       Stanza.iq(
@@ -283,18 +257,12 @@ class RosterManager extends XmppManagerBase {
   }
 
   bool rosterVersioningAvailable() {
-    return getAttributes()
+    return getAttributes().getNegotiatorById<RosterFeatureNegotiator>(rosterNegotiator)!.isSupported;
-        .getNegotiatorById<RosterFeatureNegotiator>(rosterNegotiator)!
-        .isSupported;
   }
   
   /// Attempts to add [jid] with a title of [title] and groups [groups] to the roster.
   /// Returns true if the process was successful, false otherwise.
-  Future<bool> addToRoster(
+  Future<bool> addToRoster(String jid, String title, { List<String>? groups }) async {
-    String jid,
-    String title, {
-    List<String>? groups,
-  }) async {
     final attrs = getAttributes();
     final response = await attrs.sendStanza(
       Stanza.iq(
@@ -308,13 +276,9 @@ class RosterManager extends XmppManagerBase {
                 tag: 'item',
                 attributes: <String, String>{
                   'jid': jid,
-                  ...title == jid.split('@')[0]
+                  ...title == jid.split('@')[0] ? <String, String>{} : <String, String>{ 'name': title }
-                      ? <String, String>{}
-                      : <String, String>{'name': title}
                 },
-                children: (groups ?? [])
+                children: (groups ?? []).map((group) => XMLNode(tag: 'group', text: group)).toList(),
-                    .map((group) => XMLNode(tag: 'group', text: group))
-                    .toList(),
               )
             ],
           )

packages/moxxmpp/lib/src/roster/state.dart

@@ -50,12 +50,7 @@ abstract class BaseRosterStateManager {
   ///
   /// [added] is a (possibly empty) list of XmppRosterItems that are added by the
   /// roster push or roster fetch request.
-  Future<void> commitRoster(
+  Future<void> commitRoster(String? version, List<String> removed, List<XmppRosterItem> modified, List<XmppRosterItem> added);
-    String? version,
-    List<String> removed,
-    List<XmppRosterItem> modified,
-    List<XmppRosterItem> added,
-  );
 
   /// Internal function. Registers functions from the RosterManger against this
   /// instance.
@@ -74,12 +69,7 @@ abstract class BaseRosterStateManager {
 
   /// A wrapper around _commitRoster that also sends an event to moxxmpp's event
   /// bus.
-  Future<void> _commitRoster(
+  Future<void> _commitRoster(String? version, List<String> removed, List<XmppRosterItem> modified, List<XmppRosterItem> added) async {
-    String? version,
-    List<String> removed,
-    List<XmppRosterItem> modified,
-    List<XmppRosterItem> added,
-  ) async {
     _sendEvent(
       RosterUpdatedEvent(
         removed,
@@ -226,10 +216,5 @@ class TestingRosterStateManager extends BaseRosterStateManager {
   }
 
   @override
-  Future<void> commitRoster(
+  Future<void> commitRoster(String? version, List<String> removed, List<XmppRosterItem> modified, List<XmppRosterItem> added) async {}
-    String? version,
-    List<String> removed,
-    List<XmppRosterItem> modified,
-    List<XmppRosterItem> added,
-  ) async {}
 }

packages/moxxmpp/lib/src/routing.dart

@@ -1 +1,6 @@
-enum RoutingState { error, preConnection, negotiating, handleStanzas }
+enum RoutingState {
+  error,
+  preConnection,
+  negotiating,
+  handleStanzas
+}

packages/moxxmpp/lib/src/settings.dart

@@ -1,12 +1,8 @@
 import 'package:moxxmpp/src/jid.dart';
 
 class ConnectionSettings {
-  ConnectionSettings({
+
-    required this.jid,
+  ConnectionSettings({ required this.jid, required this.password, required this.useDirectTLS, required this.allowPlainAuth });
-    required this.password,
-    required this.useDirectTLS,
-    required this.allowPlainAuth,
-  });
   final JID jid;
   final String password;
   final bool useDirectTLS;

packages/moxxmpp/lib/src/stanza.dart

@@ -25,83 +25,59 @@ class StanzaError {
 
 class Stanza extends XMLNode {
   // ignore: use_super_parameters
-  Stanza({
+  Stanza({ this.to, this.from, this.type, this.id, List<XMLNode> children = const [], required String tag, Map<String, String> attributes = const {} }) : super(
-    this.to,
-    this.from,
-    this.type,
-    this.id,
-    List<XMLNode> children = const [],
-    required String tag,
-    Map<String, String> attributes = const {},
-  }) : super(
     tag: tag,
     attributes: <String, dynamic>{
       ...attributes,
-            ...type != null
+      ...type != null ? <String, dynamic>{ 'type': type } : <String, dynamic>{},
-                ? <String, dynamic>{'type': type}
-                : <String, dynamic>{},
       ...id != null ? <String, dynamic>{ 'id': id } : <String, dynamic>{},
       ...to != null ? <String, dynamic>{ 'to': to } : <String, dynamic>{},
-            ...from != null
+      ...from != null ? <String, dynamic>{ 'from': from } : <String, dynamic>{},
-                ? <String, dynamic>{'from': from}
-                : <String, dynamic>{},
       'xmlns': stanzaXmlns
     },
     children: children,
   );
 
-  factory Stanza.iq({
+  factory Stanza.iq({ String? to, String? from, String? type, String? id, List<XMLNode> children = const [], Map<String, String>? attributes = const {} }) {
-    String? to,
-    String? from,
-    String? type,
-    String? id,
-    List<XMLNode> children = const [],
-    Map<String, String>? attributes = const {},
-  }) {
     return Stanza(
       tag: 'iq',
       from: from,
       to: to,
       id: id,
       type: type,
-      attributes: <String, String>{...attributes!, 'xmlns': stanzaXmlns},
+      attributes: <String, String>{
+        ...attributes!,
+        'xmlns': stanzaXmlns
+      },
       children: children,
     );
   }
 
-  factory Stanza.presence({
+  factory Stanza.presence({ String? to, String? from, String? type, String? id, List<XMLNode> children = const [], Map<String, String>? attributes = const {} }) {
-    String? to,
-    String? from,
-    String? type,
-    String? id,
-    List<XMLNode> children = const [],
-    Map<String, String>? attributes = const {},
-  }) {
     return Stanza(
       tag: 'presence',
       from: from,
       to: to,
       id: id,
       type: type,
-      attributes: <String, String>{...attributes!, 'xmlns': stanzaXmlns},
+      attributes: <String, String>{
+        ...attributes!,
+        'xmlns': stanzaXmlns
+      },
       children: children,
     );
   }
-  factory Stanza.message({
+  factory Stanza.message({ String? to, String? from, String? type, String? id, List<XMLNode> children = const [], Map<String, String>? attributes = const {} }) {
-    String? to,
-    String? from,
-    String? type,
-    String? id,
-    List<XMLNode> children = const [],
-    Map<String, String>? attributes = const {},
-  }) {
     return Stanza(
       tag: 'message',
       from: from,
       to: to,
       id: id,
       type: type,
-      attributes: <String, String>{...attributes!, 'xmlns': stanzaXmlns},
+      attributes: <String, String>{
+        ...attributes!,
+        'xmlns': stanzaXmlns
+      },
       children: children,
     );
   }
@@ -116,8 +92,8 @@ class Stanza extends XMLNode {
       children: node.children,
       // TODO(Unknown): Remove to, from, id, and type
       // TODO(Unknown): Not sure if this is the correct way to approach this
-      attributes:
+      attributes: node.attributes
-          node.attributes.map<String, String>((String key, dynamic value) {
+        .map<String, String>((String key, dynamic value) {
           return MapEntry(key, value.toString());
         }),
     );
@@ -128,13 +104,7 @@ class Stanza extends XMLNode {
   String? type;
   String? id;
 
-  Stanza copyWith({
+  Stanza copyWith({ String? id, String? from, String? to, String? type, List<XMLNode>? children }) {
-    String? id,
-    String? from,
-    String? to,
-    String? type,
-    List<XMLNode>? children,
-  }) {
     return Stanza(
       tag: tag,
       to: to ?? this.to,
@@ -157,15 +127,13 @@ XMLNode buildErrorElement(String type, String condition, {String? text}) {
       XMLNode.xmlns(
         tag: condition,
         xmlns: fullStanzaXmlns,
-        children: text != null
+        children: text != null ? [
-            ? [
           XMLNode.xmlns(
             tag: 'text',
             xmlns: fullStanzaXmlns,
             text: text,
           )
-              ]
+        ] : [],
-            : [],
       ),
     ],
   );

packages/moxxmpp/lib/src/stringxml.dart

@@ -16,9 +16,7 @@ class XMLNode {
       this.children = const [],
       this.closeTag = true,
       this.text,
-  })  : attributes = <String, String>{'xmlns': xmlns, ...attributes},
+  }) : attributes = <String, String>{ 'xmlns': xmlns, ...attributes }, isDeclaration = false;
-        isDeclaration = false;
-
   /// Because this API is better ;)
   /// Don't use in production. Just for testing
   factory XMLNode.fromXmlElement(XmlElement element) {
@@ -38,12 +36,10 @@ class XMLNode {
       return XMLNode(
         tag: element.name.qualified,
         attributes: attributes,
-        children:
+        children: element.childElements.toList().map(XMLNode.fromXmlElement).toList(),
-            element.childElements.toList().map(XMLNode.fromXmlElement).toList(),
       );
     }
   }
-
   /// Just for testing purposes
   factory XMLNode.fromString(String str) {
     return XMLNode.fromXmlElement(
@@ -66,10 +62,7 @@ class XMLNode {
   String renderAttributes() {
     return attributes.keys.map((String key) {
         final dynamic value = attributes[key];
-      assert(
+        assert(value is String || value is int, 'XML values must either be string or int');
-        value is String || value is int,
-        'XML values must either be string or int',
-      );
         if (value is String) {
           return "$key='$value'";
         } else {
@@ -130,8 +123,7 @@ class XMLNode {
   /// Returns all children whose tag is equal to [tag].
   List<XMLNode> findTags(String tag, { String? xmlns }) {
     return children.where((element) {
-      final xmlnsMatches =
+      final xmlnsMatches = xmlns != null ? element.attributes['xmlns'] == xmlns : true;
-          xmlns != null ? element.attributes['xmlns'] == xmlns : true;
       return element.tag == tag && xmlnsMatches;
     }).toList();
   }

packages/moxxmpp/lib/src/types/result.dart

@@ -1,9 +1,6 @@
 class Result<T, V> {
-  const Result(this._data)
+
-      : assert(
+  const Result(this._data) : assert(_data is T || _data is V, 'Invalid data type: Must be either $T or $V');
-          _data is T || _data is V,
-          'Invalid data type: Must be either $T or $V',
-        );
   final dynamic _data;
 
   bool isType<S>() => _data is S;

packages/moxxmpp/lib/src/xeps/staging/extensible_file_thumbnails.dart

@@ -8,20 +8,17 @@ const blurhashThumbnailType = '$fileThumbnailsXmlns:blurhash';
 abstract class Thumbnail {}
 
 class BlurhashThumbnail extends Thumbnail {
+
   BlurhashThumbnail(this.hash);
   final String hash;
 }
 
 Thumbnail? parseFileThumbnailElement(XMLNode node) {
-  assert(
+  assert(node.attributes['xmlns'] == fileThumbnailsXmlns, 'Invalid element xmlns');
-    node.attributes['xmlns'] == fileThumbnailsXmlns,
-    'Invalid element xmlns',
-  );
   assert(node.tag == 'file-thumbnail', 'Invalid element name');
 
   switch (node.attributes['type']!) {
-    case blurhashThumbnailType:
+    case blurhashThumbnailType: {
-      {
       final hash = node.firstTag('blurhash')!.innerText();
       return BlurhashThumbnail(hash);
     }

packages/moxxmpp/lib/src/xeps/staging/file_upload_notification.dart

@@ -41,12 +41,8 @@ class FileUploadNotificationManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
 
-  Future<StanzaHandlerData> _onFileUploadNotificationReceived(
+  Future<StanzaHandlerData> _onFileUploadNotificationReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
+    final funElement = message.firstTag('file-upload', xmlns: fileUploadNotificationXmlns)!;
-    StanzaHandlerData state,
-  ) async {
-    final funElement =
-        message.firstTag('file-upload', xmlns: fileUploadNotificationXmlns)!;
     return state.copyWith(
       fun: FileMetadataData.fromXML(
         funElement.firstTag('file', xmlns: fileMetadataXmlns)!,
@@ -54,23 +50,15 @@ class FileUploadNotificationManager extends XmppManagerBase {
     );
   }
 
-  Future<StanzaHandlerData> _onFileUploadNotificationReplacementReceived(
+  Future<StanzaHandlerData> _onFileUploadNotificationReplacementReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
+    final element = message.firstTag('replaces', xmlns: fileUploadNotificationXmlns)!;
-    StanzaHandlerData state,
-  ) async {
-    final element =
-        message.firstTag('replaces', xmlns: fileUploadNotificationXmlns)!;
     return state.copyWith(
       funReplacement: element.attributes['id']! as String,
     );
   }
 
-  Future<StanzaHandlerData> _onFileUploadNotificationCancellationReceived(
+  Future<StanzaHandlerData> _onFileUploadNotificationCancellationReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
+    final element = message.firstTag('cancels', xmlns: fileUploadNotificationXmlns)!;
-    StanzaHandlerData state,
-  ) async {
-    final element =
-        message.firstTag('cancels', xmlns: fileUploadNotificationXmlns)!;
     return state.copyWith(
       funCancellation: element.attributes['id']! as String,
     );

packages/moxxmpp/lib/src/xeps/xep_0004.dart

@@ -10,9 +10,7 @@ class DataFormOption {
   XMLNode toXml() {
     return XMLNode(
       tag: 'option',
-      attributes: label != null
+      attributes: label != null ? <String, dynamic>{ 'label': label } : <String, dynamic>{},
-          ? <String, dynamic>{'label': label}
-          : <String, dynamic>{},
       children: [
         XMLNode(
           tag: 'value',
@@ -45,13 +43,9 @@ class DataFormField {
     return XMLNode(
       tag: 'field',
       attributes: <String, dynamic>{
-        ...varAttr != null
+        ...varAttr != null ? <String, dynamic>{ 'var': varAttr } : <String, dynamic>{},
-            ? <String, dynamic>{'var': varAttr}
-            : <String, dynamic>{},
         ...type != null ? <String, dynamic>{ 'type': type } : <String, dynamic>{},
-        ...label != null
+        ...label != null ? <String, dynamic>{ 'label': label } : <String, dynamic>{}
-            ? <String, dynamic>{'label': label}
-            : <String, dynamic>{}
       },
       children: [
         ...description != null ? [XMLNode(tag: 'desc', text: description)] : [],
@@ -87,18 +81,18 @@ class DataForm {
     return XMLNode.xmlns(
       tag: 'x',
       xmlns: dataFormsXmlns,
-      attributes: {'type': type},
+      attributes: {
+        'type': type
+      },
       children: [
         ...instructions.map((i) => XMLNode(tag: 'instruction', text: i)),
         ...title != null ? [XMLNode(tag: 'title', text: title)] : [],
         ...fields.map((field) => field.toXml()),
         ...reported.map((report) => report.toXml()),
-        ...items.map(
+        ...items.map((item) => XMLNode(
-          (item) => XMLNode(
               tag: 'item',
               children: item.map((i) => i.toXml()).toList(),
-          ),
+          ),),
-        ),
       ],
     );
   }
@@ -134,19 +128,10 @@ DataForm parseDataForm(XMLNode x) {
 
   final type = x.attributes['type']! as String;
   final title = x.firstTag('title')?.innerText();
-  final instructions =
+  final instructions = x.findTags('instructions').map((i) => i.innerText()).toList();
-      x.findTags('instructions').map((i) => i.innerText()).toList();
   final fields = x.findTags('field').map(_parseDataFormField).toList();
-  final reported = x
+  final reported = x.firstTag('reported')?.findTags('field').map((i) => _parseDataFormField(i.firstTag('field')!)).toList() ?? [];
-          .firstTag('reported')
+  final items = x.findTags('item').map((i) => i.findTags('field').map(_parseDataFormField).toList()).toList();
-          ?.findTags('field')
-          .map((i) => _parseDataFormField(i.firstTag('field')!))
-          .toList() ??
-      [];
-  final items = x
-      .findTags('item')
-      .map((i) => i.findTags('field').map(_parseDataFormField).toList())
-      .toList();
 
   return DataForm(
     type: type,

packages/moxxmpp/lib/src/xeps/xep_0030/cache.dart

@@ -13,7 +13,9 @@ class DiscoCacheKey {
 
   @override
   bool operator ==(Object other) {
-    return other is DiscoCacheKey && jid == other.jid && node == other.node;
+    return other is DiscoCacheKey &&
+           jid == other.jid &&
+           node == other.node;
   }
   
   @override

packages/moxxmpp/lib/src/xeps/xep_0030/helpers.dart

@@ -5,29 +5,21 @@ import 'package:moxxmpp/src/stringxml.dart';
 // TODO(PapaTutuWawa): Move types into types.dart
 
 Stanza buildDiscoInfoQueryStanza(String entity, String? node) {
-  return Stanza.iq(
+  return Stanza.iq(to: entity, type: 'get', children: [
-    to: entity,
-    type: 'get',
-    children: [
     XMLNode.xmlns(
       tag: 'query',
       xmlns: discoInfoXmlns,
       attributes: node != null ? { 'node': node } : {},
     )
-    ],
+  ],);
-  );
 }
 
 Stanza buildDiscoItemsQueryStanza(String entity, { String? node }) {
-  return Stanza.iq(
+  return Stanza.iq(to: entity, type: 'get', children: [
-    to: entity,
-    type: 'get',
-    children: [
     XMLNode.xmlns(
       tag: 'query',
       xmlns: discoItemsXmlns,
       attributes: node != null ? { 'node': node } : {},
     )
-    ],
+  ],);
-  );
 }

packages/moxxmpp/lib/src/xeps/xep_0030/types.dart

@@ -5,12 +5,7 @@ import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/xeps/xep_0004.dart';
 
 class Identity {
-  const Identity({
+  const Identity({ required this.category, required this.type, this.name, this.lang });
-    required this.category,
-    required this.type,
-    this.name,
-    this.lang,
-  });
   final String category;
   final String type;
   final String? name;
@@ -23,9 +18,7 @@ class Identity {
         'category': category,
         'type': type,
         'name': name,
-        ...lang == null
+        ...lang == null ? <String, dynamic>{} : <String, dynamic>{ 'xml:lang': lang }
-            ? <String, dynamic>{}
-            : <String, dynamic>{'xml:lang': lang}
       },
     );
   }
@@ -57,8 +50,7 @@ class DiscoInfo {
             name: element.attributes['name'] as String?,
           ),
         );
-      } else if (element.tag == 'x' &&
+      } else if (element.tag == 'x' && element.attributes['xmlns'] == dataFormsXmlns) {
-          element.attributes['xmlns'] == dataFormsXmlns) {
         extendedInfo.add(
           parseDataForm(element),
         );
@@ -84,22 +76,18 @@ class DiscoInfo {
     return XMLNode.xmlns(
       tag: 'query',
       xmlns: discoInfoXmlns,
-      attributes: node != null
+      attributes: node != null ?
-          ? <String, String>{
+        <String, String>{ 'node': node!, } :
-              'node': node!,
+        <String, String>{},
-            }
-          : <String, String>{},
       children: [
         ...identities.map((identity) => identity.toXMLNode()),
-        ...features.map(
+        ...features.map((feature) => XMLNode(
-          (feature) => XMLNode(
           tag: 'feature',
-            attributes: {
+          attributes: { 'var': feature, },
-              'var': feature,
+        ),),
-            },
+        
-          ),
+        if (extendedInfo.isNotEmpty)
-        ),
+          ...extendedInfo.map((ei) => ei.toXml()),
-        if (extendedInfo.isNotEmpty) ...extendedInfo.map((ei) => ei.toXml()),
       ],
     );
   }

packages/moxxmpp/lib/src/xeps/xep_0030/xep_0030.dart

@@ -51,12 +51,10 @@ class DiscoManager extends XmppManagerBase {
   final Map<DiscoCacheKey, DiscoInfo> _discoInfoCache = {};
 
   /// The tracker for tracking disco#info queries that are in flight.
-  final WaitForTracker<DiscoCacheKey, Result<DiscoError, DiscoInfo>>
+  final WaitForTracker<DiscoCacheKey, Result<DiscoError, DiscoInfo>> _discoInfoTracker = WaitForTracker();
-      _discoInfoTracker = WaitForTracker();
 
   /// The tracker for tracking disco#info queries that are in flight.
-  final WaitForTracker<DiscoCacheKey, Result<DiscoError, List<DiscoItem>>>
+  final WaitForTracker<DiscoCacheKey, Result<DiscoError, List<DiscoItem>>> _discoItemsTracker = WaitForTracker();
-      _discoItemsTracker = WaitForTracker();
 
   /// Cache lock
   final Lock _cacheLock = Lock();
@@ -74,8 +72,7 @@ class DiscoManager extends XmppManagerBase {
   List<String> get features => _features;
 
   @visibleForTesting
-  WaitForTracker<DiscoCacheKey, Result<DiscoError, DiscoInfo>>
+  WaitForTracker<DiscoCacheKey, Result<DiscoError, DiscoInfo>> get infoTracker => _discoInfoTracker;
-      get infoTracker => _discoInfoTracker;
   
   @override
   List<StanzaHandler> getIncomingStanzaHandlers() => [
@@ -175,11 +172,8 @@ class DiscoManager extends XmppManagerBase {
     if (cached) return;
 
     // Request the cap hash
-    logger.finest(
+    logger.finest("Received capability hash we don't know about. Requesting it...");
-      "Received capability hash we don't know about. Requesting it...",
+    final result = await discoInfoQuery(from.toString(), node: '${info.node}#${info.ver}');
-    );
-    final result =
-        await discoInfoQuery(from.toString(), node: '${info.node}#${info.ver}');
     if (result.isType<DiscoError>()) return;
 
     await _cacheLock.synchronized(() async {
@@ -201,10 +195,7 @@ class DiscoManager extends XmppManagerBase {
     );
   }
   
-  Future<StanzaHandlerData> _onDiscoInfoRequest(
+  Future<StanzaHandlerData> _onDiscoInfoRequest(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     if (stanza.type != 'get') return state;
 
     final query = stanza.firstTag('query', xmlns: discoInfoXmlns)!;
@@ -235,10 +226,7 @@ class DiscoManager extends XmppManagerBase {
     return state.copyWith(done: true);
   }
 
-  Future<StanzaHandlerData> _onDiscoItemsRequest(
+  Future<StanzaHandlerData> _onDiscoItemsRequest(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     if (stanza.type != 'get') return state;
 
     final query = stanza.firstTag('query', xmlns: discoItemsXmlns)!;
@@ -266,10 +254,7 @@ class DiscoManager extends XmppManagerBase {
     return state;
   }
 
-  Future<void> _exitDiscoInfoCriticalSection(
+  Future<void> _exitDiscoInfoCriticalSection(DiscoCacheKey key, Result<DiscoError, DiscoInfo> result) async {
-    DiscoCacheKey key,
-    Result<DiscoError, DiscoInfo> result,
-  ) async {
     await _cacheLock.synchronized(() async {
       // Add to cache if it is a result
       if (result.isType<DiscoInfo>()) {
@@ -281,16 +266,10 @@ class DiscoManager extends XmppManagerBase {
   }
   
   /// Sends a disco info query to the (full) jid [entity], optionally with node=[node].
-  Future<Result<DiscoError, DiscoInfo>> discoInfoQuery(
+  Future<Result<DiscoError, DiscoInfo>> discoInfoQuery(String entity, { String? node, bool shouldEncrypt = true }) async {
-    String entity, {
-    String? node,
-    bool shouldEncrypt = true,
-  }) async {
     final cacheKey = DiscoCacheKey(entity, node);
     DiscoInfo? info;
-    final ffuture = await _cacheLock
+    final ffuture = await _cacheLock.synchronized<Future<Future<Result<DiscoError, DiscoInfo>>?>?>(() async {
-        .synchronized<Future<Future<Result<DiscoError, DiscoInfo>>?>?>(
-            () async {
       // Check if we already know what the JID supports
       if (_discoInfoCache.containsKey(cacheKey)) {
         info = _discoInfoCache[cacheKey];
@@ -338,26 +317,22 @@ class DiscoManager extends XmppManagerBase {
   }
 
   /// Sends a disco items query to the (full) jid [entity], optionally with node=[node].
-  Future<Result<DiscoError, List<DiscoItem>>> discoItemsQuery(
+  Future<Result<DiscoError, List<DiscoItem>>> discoItemsQuery(String entity, { String? node, bool shouldEncrypt = true }) async {
-    String entity, {
-    String? node,
-    bool shouldEncrypt = true,
-  }) async {
     final key = DiscoCacheKey(entity, node);
     final future = await _discoItemsTracker.waitFor(key);
     if (future != null) {
       return future;
     }
 
-    final stanza = await getAttributes().sendStanza(
+    final stanza = await getAttributes()
+      .sendStanza(
         buildDiscoItemsQueryStanza(entity, node: node),
         encrypted: !shouldEncrypt,
       ) as Stanza;
 
     final query = stanza.firstTag('query');
     if (query == null) {
-      final result =
+      final result = Result<DiscoError, List<DiscoItem>>(InvalidResponseDiscoError());
-          Result<DiscoError, List<DiscoItem>>(InvalidResponseDiscoError());
       await _discoItemsTracker.resolve(key, result);
       return result;
     }
@@ -365,22 +340,16 @@ class DiscoManager extends XmppManagerBase {
     if (stanza.type == 'error') {
       //final error = stanza.firstTag('error');
       //print("Disco Items error: " + error.toXml());
-      final result =
+      final result = Result<DiscoError, List<DiscoItem>>(ErrorResponseDiscoError());
-          Result<DiscoError, List<DiscoItem>>(ErrorResponseDiscoError());
       await _discoItemsTracker.resolve(key, result);
       return result;
     }
 
-    final items = query
+    final items = query.findTags('item').map((node) => DiscoItem(
-        .findTags('item')
-        .map(
-          (node) => DiscoItem(
       jid: node.attributes['jid']! as String,
       node: node.attributes['node'] as String?,
       name: node.attributes['name'] as String?,
-          ),
+    ),).toList();
-        )
-        .toList();
 
     final result = Result<DiscoError, List<DiscoItem>>(items);
     await _discoItemsTracker.resolve(key, result);
@@ -388,11 +357,7 @@ class DiscoManager extends XmppManagerBase {
   }
 
   /// Queries information about a jid based on its node and capability hash.
-  Future<Result<DiscoError, DiscoInfo>> discoInfoCapHashQuery(
+  Future<Result<DiscoError, DiscoInfo>> discoInfoCapHashQuery(String jid, String node, String ver) async {
-    String jid,
-    String node,
-    String ver,
-  ) async {
     return discoInfoQuery(jid, node: '$node#$ver');
   }
 

packages/moxxmpp/lib/src/xeps/xep_0054.dart

@@ -49,10 +49,7 @@ class VCardManager extends XmppManagerBase {
     _lastHash[jid] = hash;
   }
   
-  Future<StanzaHandlerData> _onPresence(
+  Future<StanzaHandlerData> _onPresence(Stanza presence, StanzaHandlerData state) async {
-    Stanza presence,
-    StanzaHandlerData state,
-  ) async {
     final x = presence.firstTag('x', xmlns: vCardTempUpdate)!;
     final hash = x.firstTag('photo')!.innerText();
 
@@ -117,13 +114,9 @@ class VCardManager extends XmppManagerBase {
       encrypted: true,
     );
 
-    if (result.attributes['type'] != 'result') {
+    if (result.attributes['type'] != 'result') return Result(UnknownVCardError());
-      return Result(UnknownVCardError());
-    }
     final vcard = result.firstTag('vCard', xmlns: vCardTempXmlns);
-    if (vcard == null) {
+    if (vcard == null) return Result(UnknownVCardError());
-      return Result(UnknownVCardError());
-    }
     
     return Result(_parseVCard(vcard));
   } 

packages/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart

@@ -37,37 +37,29 @@ class PubSubPublishOptions {
           varAttr: 'FORM_TYPE',
           type: 'hidden',
         ),
-        ...accessModel != null
+        ...accessModel != null ? [
-            ? [
             DataFormField(
               options: [],
               isRequired: false,
               values: [ accessModel! ],
               varAttr: 'pubsub#access_model',
             )
-              ]
+          ] : [],
-            : [],
+        ...maxItems != null ? [
-        ...maxItems != null
-            ? [
           DataFormField(
             options: [],
             isRequired: false,
             values: [maxItems! ],
             varAttr: 'pubsub#max_items',
           ),
-              ]
+        ] : [],
-            : [],
       ],
     ).toXml();
   }
 }
 
 class PubSubItem {
-  const PubSubItem({
+  const PubSubItem({ required this.id, required this.node, required this.payload });
-    required this.id,
-    required this.node,
-    required this.payload,
-  });
   final String id;
   final String node;
   final XMLNode payload;
@@ -92,25 +84,20 @@ class PubSubManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
 
-  Future<StanzaHandlerData> _onPubsubMessage(
+  Future<StanzaHandlerData> _onPubsubMessage(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     logger.finest('Received PubSub event');
     final event = message.firstTag('event', xmlns: pubsubEventXmlns)!;
     final items = event.firstTag('items')!;
     final item = items.firstTag('item')!;
 
-    getAttributes().sendEvent(
+    getAttributes().sendEvent(PubSubNotificationEvent(
-      PubSubNotificationEvent(
       item: PubSubItem(
         id: item.attributes['id']! as String,
         node: items.attributes['node']! as String,
         payload: item.children[0],
       ),
       from: message.attributes['from']! as String,
-      ),
+    ),);
-    );
     
     return state.copyWith(done: true);
   }
@@ -120,9 +107,7 @@ class PubSubManager extends XmppManagerBase {
     final response = await dm.discoItemsQuery(jid, node: node);
     var count = 0;
     if (response.isType<DiscoError>()) {
-      logger.warning(
+      logger.warning('_getNodeItemCount: disco#items query failed. Assuming no items.');
-        '_getNodeItemCount: disco#items query failed. Assuming no items.',
-      );
     } else {
       count = response.get<List<DiscoItem>>().length;
     }
@@ -130,27 +115,19 @@ class PubSubManager extends XmppManagerBase {
     return count;
   }
   
-  Future<PubSubPublishOptions> _preprocessPublishOptions(
+  Future<PubSubPublishOptions> _preprocessPublishOptions(String jid, String node, PubSubPublishOptions options) async {
-    String jid,
-    String node,
-    PubSubPublishOptions options,
-  ) async {
     if (options.maxItems != null) {
       final dm = getAttributes().getManagerById<DiscoManager>(discoManager)!;
       final result = await dm.discoInfoQuery(jid);
       if (result.isType<DiscoError>()) {
         if (options.maxItems == 'max') {
-          logger.severe(
+          logger.severe('disco#info query failed and options.maxItems is set to "max".');
-            'disco#info query failed and options.maxItems is set to "max".',
-          );
           return options;
         }
       }
 
-      final nodeMultiItemsSupported = result.isType<DiscoInfo>() &&
+      final nodeMultiItemsSupported = result.isType<DiscoInfo>() && result.get<DiscoInfo>().features.contains(pubsubNodeConfigMultiItems);
-          result.get<DiscoInfo>().features.contains(pubsubNodeConfigMultiItems);
+      final nodeMaxSupported = result.isType<DiscoInfo>() && result.get<DiscoInfo>().features.contains(pubsubNodeConfigMax);
-      final nodeMaxSupported = result.isType<DiscoInfo>() &&
-          result.get<DiscoInfo>().features.contains(pubsubNodeConfigMax);
       if (options.maxItems != null && !nodeMultiItemsSupported) {
         // TODO(PapaTutuWawa): Here, we need to admit defeat
         logger.finest('PubSub host does not support multi-items!');
@@ -159,9 +136,7 @@ class PubSubManager extends XmppManagerBase {
           accessModel: options.accessModel,
         );
       } else if (options.maxItems == 'max' && !nodeMaxSupported) {
-        logger.finest(
+        logger.finest('PubSub host does not support node-config-max. Working around it');
-          'PubSub host does not support node-config-max. Working around it',
-        );
         final count = await _getNodeItemCount(jid, node) + 1;
 
         return PubSubPublishOptions(
@@ -198,19 +173,13 @@ class PubSubManager extends XmppManagerBase {
       ),
     );
 
-    if (result.attributes['type'] != 'result') {
+    if (result.attributes['type'] != 'result') return Result(UnknownPubSubError());
-      return Result(UnknownPubSubError());
-    }
 
     final pubsub = result.firstTag('pubsub', xmlns: pubsubXmlns);
-    if (pubsub == null) {
+    if (pubsub == null) return Result(UnknownPubSubError());
-      return Result(UnknownPubSubError());
-    }
 
     final subscription = pubsub.firstTag('subscription');
-    if (subscription == null) {
+    if (subscription == null) return Result(UnknownPubSubError());
-      return Result(UnknownPubSubError());
-    }
 
     return Result(subscription.attributes['subscription'] == 'subscribed');
   }
@@ -239,19 +208,13 @@ class PubSubManager extends XmppManagerBase {
       ),
     );
 
-    if (result.attributes['type'] != 'result') {
+    if (result.attributes['type'] != 'result') return Result(UnknownPubSubError());
-      return Result(UnknownPubSubError());
-    }
 
     final pubsub = result.firstTag('pubsub', xmlns: pubsubXmlns);
-    if (pubsub == null) {
+    if (pubsub == null) return Result(UnknownPubSubError());
-      return Result(UnknownPubSubError());
-    }
 
     final subscription = pubsub.firstTag('subscription');
-    if (subscription == null) {
+    if (subscription == null) return Result(UnknownPubSubError());
-      return Result(UnknownPubSubError());
-    }
 
     return Result(subscription.attributes['subscription'] == 'none');
   }
@@ -264,7 +227,8 @@ class PubSubManager extends XmppManagerBase {
     XMLNode payload, {
       String? id,
       PubSubPublishOptions? options,
-  }) async {
+    }
+  ) async {
     return _publish(
       jid,
       node,
@@ -282,7 +246,8 @@ class PubSubManager extends XmppManagerBase {
       PubSubPublishOptions? options,
       // Should, if publishing fails, try to reconfigure and publish again?
       bool tryConfigureAndPublish = true,
-  }) async {
+    }
+  ) async {
     PubSubPublishOptions? pubOptions;
     if (options != null) {
       pubOptions = await _preprocessPublishOptions(jid, node, options);
@@ -303,21 +268,17 @@ class PubSubManager extends XmppManagerBase {
                 children: [
                   XMLNode(
                     tag: 'item',
-                    attributes: id != null
+                    attributes: id != null ? <String, String>{ 'id': id } : <String, String>{},
-                        ? <String, String>{'id': id}
-                        : <String, String>{},
                     children: [ payload ],
                   )
                 ],
               ),
-              ...options != null
+              ...options != null ? [
-                  ? [
                 XMLNode(
                   tag: 'publish-options',
                   children: [options.toXml()],
                 ), 
-                    ]
+              ] : [],
-                  : [],
             ],
           )
         ],
@@ -341,16 +302,10 @@ class PubSubManager extends XmppManagerBase {
           options: options,
           tryConfigureAndPublish: false,
         );
-        if (publishResult.isType<PubSubError>()) {
+        if (publishResult.isType<PubSubError>()) return publishResult;
-          return publishResult;
+      } else if (error is EjabberdMaxItemsError && tryConfigureAndPublish && options != null) {
-        }
-      } else if (error is EjabberdMaxItemsError &&
-          tryConfigureAndPublish &&
-          options != null) {
         // TODO(Unknown): Remove once ejabberd fixes the bug. See errors.dart for more info.
-        logger.warning(
+        logger.warning('Publish failed due to the server rejecting the usage of "max" for "max_items" in publish options. Configuring...');
-          'Publish failed due to the server rejecting the usage of "max" for "max_items" in publish options. Configuring...',
-        );
         final count = await _getNodeItemCount(jid, node) + 1;
         return publish(
           jid,
@@ -368,31 +323,20 @@ class PubSubManager extends XmppManagerBase {
     }
 
     final pubsubElement = result.firstTag('pubsub', xmlns: pubsubXmlns);
-    if (pubsubElement == null) {
+    if (pubsubElement == null) return Result(MalformedResponseError());
-      return Result(MalformedResponseError());
-    }
 
     final publishElement = pubsubElement.firstTag('publish');
-    if (publishElement == null) {
+    if (publishElement == null) return Result(MalformedResponseError());
-      return Result(MalformedResponseError());
-    }
 
     final item = publishElement.firstTag('item');
-    if (item == null) {
+    if (item == null) return Result(MalformedResponseError());
-      return Result(MalformedResponseError());
-    }
 
-    if (id != null) {
+    if (id != null) return Result(item.attributes['id'] == id);
-      return Result(item.attributes['id'] == id);
-    }
 
     return const Result(true);
   }
   
-  Future<Result<PubSubError, List<PubSubItem>>> getItems(
+  Future<Result<PubSubError, List<PubSubItem>>> getItems(String jid, String node) async {
-    String jid,
-    String node,
-  ) async {
     final result = await getAttributes().sendStanza(
       Stanza.iq(
         type: 'get',
@@ -409,31 +353,26 @@ class PubSubManager extends XmppManagerBase {
       ),
     );
 
-    if (result.attributes['type'] != 'result') {
+    if (result.attributes['type'] != 'result') return Result(getPubSubError(result));
-      return Result(getPubSubError(result));
-    }
 
     final pubsub = result.firstTag('pubsub', xmlns: pubsubXmlns);
-    if (pubsub == null) {
+    if (pubsub == null) return Result(getPubSubError(result));
-      return Result(getPubSubError(result));
-    }
 
-    final items = pubsub.firstTag('items')!.children.map((item) {
+    final items = pubsub
+      .firstTag('items')!
+      .children.map((item) {
         return PubSubItem(
           id: item.attributes['id']! as String,
           payload: item.children[0],
           node: node,
         );
-    }).toList();
+      })
+      .toList();
 
     return Result(items);
   }
 
-  Future<Result<PubSubError, PubSubItem>> getItem(
+  Future<Result<PubSubError, PubSubItem>> getItem(String jid, String node, String id) async {
-    String jid,
-    String node,
-    String id,
-  ) async {
     final result = await getAttributes().sendStanza(
       Stanza.iq(
         type: 'get',
@@ -459,9 +398,7 @@ class PubSubManager extends XmppManagerBase {
       ),
     );
 
-    if (result.attributes['type'] != 'result') {
+    if (result.attributes['type'] != 'result') return Result(getPubSubError(result));
-      return Result(getPubSubError(result));
-    }
 
     final pubsub = result.firstTag('pubsub', xmlns: pubsubXmlns);
     if (pubsub == null) return Result(getPubSubError(result));
@@ -478,11 +415,7 @@ class PubSubManager extends XmppManagerBase {
     return Result(item);
   }
 
-  Future<Result<PubSubError, bool>> configure(
+  Future<Result<PubSubError, bool>> configure(String jid, String node, PubSubPublishOptions options) async {
-    String jid,
-    String node,
-    PubSubPublishOptions options,
-  ) async {
     final attrs = getAttributes();
 
     // Request the form
@@ -506,9 +439,7 @@ class PubSubManager extends XmppManagerBase {
         ],
       ),
     );
-    if (form.attributes['type'] != 'result') {
+    if (form.attributes['type'] != 'result') return Result(getPubSubError(form));
-      return Result(getPubSubError(form));
-    }
 
     final submit = await attrs.sendStanza(
       Stanza.iq(
@@ -533,9 +464,7 @@ class PubSubManager extends XmppManagerBase {
         ],
       ),
     );
-    if (submit.attributes['type'] != 'result') {
+    if (submit.attributes['type'] != 'result') return Result(getPubSubError(form));
-      return Result(getPubSubError(form));
-    }
 
     return const Result(true);
   }
@@ -570,11 +499,7 @@ class PubSubManager extends XmppManagerBase {
     return const Result(true);
   }
 
-  Future<Result<PubSubError, bool>> retract(
+  Future<Result<PubSubError, bool>> retract(JID host, String node, String itemId) async {
-    JID host,
-    String node,
-    String itemId,
-  ) async {
     final request = await getAttributes().sendStanza(
       Stanza.iq(
         type: 'set',

packages/moxxmpp/lib/src/xeps/xep_0066.dart

@@ -51,10 +51,7 @@ class OOBManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final x = message.firstTag('x', xmlns: oobDataXmlns)!;
     final url = x.firstTag('url');
     final desc = x.firstTag('desc');

packages/moxxmpp/lib/src/xeps/xep_0084.dart

@@ -47,8 +47,7 @@ class UserAvatarMetadata {
 class UserAvatarManager extends XmppManagerBase {
   UserAvatarManager() : super(userAvatarManager);
 
-  PubSubManager _getPubSubManager() =>
+  PubSubManager _getPubSubManager() => getAttributes().getManagerById(pubsubManager)! as PubSubManager;
-      getAttributes().getManagerById(pubsubManager)! as PubSubManager;
   
   @override
   Future<void> onXmppEvent(XmppEvent event) async {
@@ -57,9 +56,7 @@ class UserAvatarManager extends XmppManagerBase {
 
       if (event.item.payload.tag != 'data' ||
           event.item.payload.attributes['xmlns'] != userAvatarDataXmlns) {
-        logger.warning(
+        logger.warning('Received avatar update from ${event.from} but the payload is invalid. Ignoring...');
-          'Received avatar update from ${event.from} but the payload is invalid. Ignoring...',
-        );
         return;
       }
 
@@ -99,11 +96,7 @@ class UserAvatarManager extends XmppManagerBase {
   /// Publish the avatar data, [base64], on the pubsub node using [hash] as
   /// the item id. [hash] must be the SHA-1 hash of the image data, while
   /// [base64] must be the base64-encoded version of the image data.
-  Future<Result<AvatarError, bool>> publishUserAvatar(
+  Future<Result<AvatarError, bool>> publishUserAvatar(String base64, String hash, bool public) async {
-    String base64,
-    String hash,
-    bool public,
-  ) async {
     final pubsub = _getPubSubManager();
     final result = await pubsub.publish(
       getAttributes().getFullJID().toBare().toString(),
@@ -127,10 +120,7 @@ class UserAvatarManager extends XmppManagerBase {
   /// Publish avatar metadata [metadata] to the User Avatar's metadata node. If [public]
   /// is true, then the node will be set to an 'open' access model. If [public] is false,
   /// then the node will be set to an 'roster' access model.
-  Future<Result<AvatarError, bool>> publishUserAvatarMetadata(
+  Future<Result<AvatarError, bool>> publishUserAvatarMetadata(UserAvatarMetadata metadata, bool public) async {
-    UserAvatarMetadata metadata,
-    bool public,
-  ) async {
     final pubsub = _getPubSubManager();
     final result = await pubsub.publish(
       getAttributes().getFullJID().toBare().toString(),
@@ -182,11 +172,7 @@ class UserAvatarManager extends XmppManagerBase {
   /// the node.
   Future<Result<AvatarError, String>> getAvatarId(String jid) async {
     final disco = getAttributes().getManagerById(discoManager)! as DiscoManager;
-    final response = await disco.discoItemsQuery(
+    final response = await disco.discoItemsQuery(jid, node: userAvatarDataXmlns, shouldEncrypt: false);
-      jid,
-      node: userAvatarDataXmlns,
-      shouldEncrypt: false,
-    );
     if (response.isType<DiscoError>()) return Result(UnknownAvatarError());
 
     final items = response.get<List<DiscoItem>>();

packages/moxxmpp/lib/src/xeps/xep_0085.dart

@@ -6,37 +6,36 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 
-enum ChatState { active, composing, paused, inactive, gone }
+enum ChatState {
+  active,
+  composing,
+  paused,
+  inactive,
+  gone
+}
 
 ChatState chatStateFromString(String raw) {
   switch(raw) {
-    case 'active':
+    case 'active': {
-      {
       return ChatState.active;
     }
-    case 'composing':
+    case 'composing': {
-      {
       return ChatState.composing;
     } 
-    case 'paused':
+    case 'paused': {
-      {
       return ChatState.paused;
     }
-    case 'inactive':
+    case 'inactive': {
-      {
       return ChatState.inactive;
     }
-    case 'gone':
+    case 'gone': {
-      {
       return ChatState.gone;
     }
-    default:
+    default: {
-      {
       return ChatState.gone;
     }
   }
 }
-
 String chatStateToString(ChatState state) => state.toString().split('.').last;
 
 class ChatStateManager extends XmppManagerBase {
@@ -59,41 +58,32 @@ class ChatStateManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onChatStateReceived(
+  Future<StanzaHandlerData> _onChatStateReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final element = state.stanza.firstTagByXmlns(chatStateXmlns)!;
     ChatState? chatState;
 
     switch (element.tag) {
-      case 'active':
+      case 'active': {
-        {
         chatState = ChatState.active;
       }
       break;
-      case 'composing':
+      case 'composing': {
-        {
         chatState = ChatState.composing;
       }
       break;
-      case 'paused':
+      case 'paused': {
-        {
         chatState = ChatState.paused;
       }
       break;
-      case 'inactive':
+      case 'inactive': {
-        {
         chatState = ChatState.inactive;
       }
       break;
-      case 'gone':
+      case 'gone': {
-        {
         chatState = ChatState.gone;
       }
       break;
-      default:
+      default: {
-        {
         logger.warning("Received invalid chat state '${element.tag}'");
       }
     }
@@ -103,11 +93,7 @@ class ChatStateManager extends XmppManagerBase {
 
   /// Send a chat state notification to [to]. You can specify the type attribute
   /// of the message with [messageType].
-  void sendChatState(
+  void sendChatState(ChatState state, String to, { String messageType = 'chat' }) {
-    ChatState state,
-    String to, {
-    String messageType = 'chat',
-  }) {
     final tagName = state.toString().split('.').last;
 
     getAttributes().sendStanza(

packages/moxxmpp/lib/src/xeps/xep_0115.dart

@@ -21,16 +21,10 @@ class CapabilityHashInfo {
 
 /// Calculates the Entitiy Capability hash according to XEP-0115 based on the
 /// disco information.
-Future<String> calculateCapabilityHash(
+Future<String> calculateCapabilityHash(DiscoInfo info, HashAlgorithm algorithm) async {
-  DiscoInfo info,
-  HashAlgorithm algorithm,
-) async {
   final buffer = StringBuffer();
   final identitiesSorted = info.identities
-      .map(
+    .map((Identity i) => '${i.category}/${i.type}/${i.lang ?? ""}/${i.name ?? ""}')
-        (Identity i) =>
-            '${i.category}/${i.type}/${i.lang ?? ""}/${i.name ?? ""}',
-      )
     .toList();
   // ignore: cascade_invocations
   identitiesSorted.sort(ioctetSortComparator);
@@ -42,8 +36,7 @@ Future<String> calculateCapabilityHash(
 
   if (info.extendedInfo.isNotEmpty) {
     final sortedExt = info.extendedInfo
-      ..sort(
+      ..sort((a, b) => ioctetSortComparator(
-        (a, b) => ioctetSortComparator(
         a.getFieldByVar('FORM_TYPE')!.values.first,
         b.getFieldByVar('FORM_TYPE')!.values.first,
       ),
@@ -52,9 +45,7 @@ Future<String> calculateCapabilityHash(
     for (final ext in sortedExt) {
       buffer.write('${ext.getFieldByVar("FORM_TYPE")!.values.first}<');
 
-      final sortedFields = ext.fields
+      final sortedFields = ext.fields..sort((a, b) => ioctetSortComparator(
-        ..sort(
-          (a, b) => ioctetSortComparator(
           a.varAttr!,
           b.varAttr!,
         ),
@@ -72,8 +63,7 @@ Future<String> calculateCapabilityHash(
     }
   }
   
-  return base64
+  return base64.encode((await algorithm.hash(utf8.encode(buffer.toString()))).bytes);
-      .encode((await algorithm.hash(utf8.encode(buffer.toString()))).bytes);
 }
 
 /// A manager implementing the advertising of XEP-0115. It responds to the
@@ -81,8 +71,7 @@ Future<String> calculateCapabilityHash(
 /// the DiscoManager.
 /// NOTE: This manager requires that the DiscoManager is also registered.
 class EntityCapabilitiesManager extends XmppManagerBase {
-  EntityCapabilitiesManager(this._capabilityHashBase)
+  EntityCapabilitiesManager(this._capabilityHashBase) : super(entityCapabilitiesManager);
-      : super(entityCapabilitiesManager);
 
   /// The string that is both the node under which we advertise the disco info
   /// and the base for the actual node on which we respond to disco#info requests.
@@ -139,9 +128,7 @@ class EntityCapabilitiesManager extends XmppManagerBase {
   Future<void> postRegisterCallback() async {
     await super.postRegisterCallback();
     
-    getAttributes()
+    getAttributes().getManagerById<DiscoManager>(discoManager)!.registerInfoCallback(
-        .getManagerById<DiscoManager>(discoManager)!
-        .registerInfoCallback(
         await _getNode(),
         _onInfoQuery,
       );

packages/moxxmpp/lib/src/xeps/xep_0184.dart

@@ -52,24 +52,15 @@ class MessageDeliveryReceiptManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onDeliveryRequestReceived(
+  Future<StanzaHandlerData> _onDeliveryRequestReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     return state.copyWith(deliveryReceiptRequested: true);
   }
   
-  Future<StanzaHandlerData> _onDeliveryReceiptReceived(
+  Future<StanzaHandlerData> _onDeliveryReceiptReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final received = message.firstTag('received', xmlns: deliveryXmlns)!;
     for (final item in message.children) {
-      if (!['origin-id', 'stanza-id', 'delay', 'store', 'received']
+      if (!['origin-id', 'stanza-id', 'delay', 'store', 'received'].contains(item.tag)) {
-          .contains(item.tag)) {
+        logger.info("Won't handle stanza as delivery receipt because we found an '${item.tag}' element");
-        logger.info(
-          "Won't handle stanza as delivery receipt because we found an '${item.tag}' element",
-        );
 
         return state.copyWith(done: true);
       }

packages/moxxmpp/lib/src/xeps/xep_0191.dart

@@ -55,28 +55,19 @@ class BlockingManager extends XmppManagerBase {
     }
   }
   
-  Future<StanzaHandlerData> _blockPush(
+  Future<StanzaHandlerData> _blockPush(Stanza iq, StanzaHandlerData state) async {
-    Stanza iq,
-    StanzaHandlerData state,
-  ) async {
     final block = iq.firstTag('block', xmlns: blockingXmlns)!;
 
     getAttributes().sendEvent(
       BlocklistBlockPushEvent(
-        items: block
+        items: block.findTags('item').map((i) => i.attributes['jid']! as String).toList(),
-            .findTags('item')
-            .map((i) => i.attributes['jid']! as String)
-            .toList(),
       ),
     );
 
     return state.copyWith(done: true);
   }
 
-  Future<StanzaHandlerData> _unblockPush(
+  Future<StanzaHandlerData> _unblockPush(Stanza iq, StanzaHandlerData state) async {
-    Stanza iq,
-    StanzaHandlerData state,
-  ) async {
     final unblock = iq.firstTag('unblock', xmlns: blockingXmlns)!;
     final items = unblock.findTags('item');
 
@@ -103,12 +94,14 @@ class BlockingManager extends XmppManagerBase {
           XMLNode.xmlns(
             tag: 'block',
             xmlns: blockingXmlns,
-            children: items.map((item) {
+            children: items
+              .map((item) {
                 return XMLNode(
                   tag: 'item',
                   attributes: <String, String>{ 'jid': item },
                 );
-            }).toList(),
+              })
+              .toList(),
           )
         ],
       ),
@@ -143,14 +136,10 @@ class BlockingManager extends XmppManagerBase {
           XMLNode.xmlns(
             tag: 'unblock',
             xmlns: blockingXmlns,
-            children: items
+            children: items.map((item) => XMLNode(
-                .map(
-                  (item) => XMLNode(
                 tag: 'item',
                 attributes: <String, String>{ 'jid': item },
-                  ),
+            ),).toList(),
-                )
-                .toList(),
           )
         ],
       ),
@@ -173,9 +162,6 @@ class BlockingManager extends XmppManagerBase {
     );
 
     final blocklist = result.firstTag('blocklist', xmlns: blockingXmlns)!;
-    return blocklist
+    return blocklist.findTags('item').map((item) => item.attributes['jid']! as String).toList();
-        .findTags('item')
-        .map((item) => item.attributes['jid']! as String)
-        .toList();
   }
 }

packages/moxxmpp/lib/src/xeps/xep_0198/negotiator.dart

@@ -54,32 +54,25 @@ class StreamManagementNegotiator extends XmppFeatureNegotiatorBase {
     } else {
       // We cannot do a stream resumption
       final br = attributes.getNegotiatorById(resourceBindingNegotiator);
-      return super.matchesFeature(features) &&
+      return super.matchesFeature(features) && br?.state == NegotiatorState.done && attributes.isAuthenticated();
-          br?.state == NegotiatorState.done &&
-          attributes.isAuthenticated();
     }
   }
       
   @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
-    XMLNode nonza,
-  ) async {
     // negotiate is only called when we matched the stream feature, so we know
     // that the server advertises it.
     _supported = true;
 
     switch (_state) {
       case _StreamManagementNegotiatorState.ready:
-        final sm =
+        final sm = attributes.getManagerById<StreamManagementManager>(smManager)!;
-            attributes.getManagerById<StreamManagementManager>(smManager)!;
         final srid = sm.state.streamResumptionId;
         final h = sm.state.s2c;
 
         // Attempt stream resumption first
         if (srid != null) {
-          _log.finest(
+          _log.finest('Found stream resumption Id. Attempting to perform stream resumption');
-            'Found stream resumption Id. Attempting to perform stream resumption',
-          );
           _state = _StreamManagementNegotiatorState.resumeRequested;
           attributes.sendNonza(StreamManagementResumeNonza(srid, h));
         } else {
@@ -93,10 +86,7 @@ class StreamManagementNegotiator extends XmppFeatureNegotiatorBase {
           if (nonza.tag == 'resumed') {
             _log.finest('Stream Management resumption successful');
 
-          assert(
+            assert(attributes.getFullJID().resource != '', 'Resume only works when we already have a resource bound and know about it');
-            attributes.getFullJID().resource != '',
-            'Resume only works when we already have a resource bound and know about it',
-          );
 
             final csi = attributes.getManagerById(csiManager) as CSIManager?;
             if (csi != null) {
@@ -111,12 +101,9 @@ class StreamManagementNegotiator extends XmppFeatureNegotiatorBase {
             return const Result(NegotiatorState.skipRest);
           } else {
             // We assume it is <failed />
-          _log.info(
+            _log.info('Stream resumption failed. Expected <resumed />, got ${nonza.tag}, Proceeding with new stream...');
-            'Stream resumption failed. Expected <resumed />, got ${nonza.tag}, Proceeding with new stream...',
-          );
             await attributes.sendEvent(StreamResumeFailedEvent());
-          final sm =
+            final sm = attributes.getManagerById<StreamManagementManager>(smManager)!;
-              attributes.getManagerById<StreamManagementManager>(smManager)!;
 
             // We have to do this because we otherwise get a stanza stuck in the queue,
             // thus spamming the server on every <a /> nonza we receive.
@@ -134,8 +121,7 @@ class StreamManagementNegotiator extends XmppFeatureNegotiatorBase {
           _log.finest('Stream Management enabled');
 
           final id = nonza.attributes['id'] as String?;
-          if (id != null &&
+          if (id != null && ['true', '1'].contains(nonza.attributes['resume'])) {
-              ['true', '1'].contains(nonza.attributes['resume'])) {
             _log.info('Stream Resumption available');
           }
 

packages/moxxmpp/lib/src/xeps/xep_0198/nonzas.dart

@@ -2,16 +2,17 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 
 class StreamManagementEnableNonza extends XMLNode {
-  StreamManagementEnableNonza()
+  StreamManagementEnableNonza() : super(
-      : super(
     tag: 'enable',
-          attributes: <String, String>{'xmlns': smXmlns, 'resume': 'true'},
+    attributes: <String, String>{
+      'xmlns': smXmlns,
+      'resume': 'true'
+    },
   );
 }
 
 class StreamManagementResumeNonza extends XMLNode {
-  StreamManagementResumeNonza(String id, int h)
+  StreamManagementResumeNonza(String id, int h) : super(
-      : super(
     tag: 'resume',
     attributes: <String, String>{
       'xmlns': smXmlns,
@@ -22,16 +23,17 @@ class StreamManagementResumeNonza extends XMLNode {
 }
 
 class StreamManagementAckNonza extends XMLNode {
-  StreamManagementAckNonza(int h)
+  StreamManagementAckNonza(int h) : super(
-      : super(
     tag: 'a',
-          attributes: <String, String>{'xmlns': smXmlns, 'h': h.toString()},
+    attributes: <String, String>{
+      'xmlns': smXmlns,
+      'h': h.toString()
+    },
   );
 }
 
 class StreamManagementRequestNonza extends XMLNode {
-  StreamManagementRequestNonza()
+  StreamManagementRequestNonza() : super(
-      : super(
     tag: 'r',
     attributes: <String, String>{
       'xmlns': smXmlns,

packages/moxxmpp/lib/src/xeps/xep_0198/state.dart

@@ -7,12 +7,13 @@ part 'state.g.dart';
 class StreamManagementState with _$StreamManagementState {
   factory StreamManagementState(
     int c2s,
-    int s2c, {
+    int s2c,
+    {
       String? streamResumptionLocation,
       String? streamResumptionId,
-  }) = _StreamManagementState;
+    }
+  ) = _StreamManagementState;
 
   // JSON
-  factory StreamManagementState.fromJson(Map<String, dynamic> json) =>
+  factory StreamManagementState.fromJson(Map<String, dynamic> json) => _$StreamManagementStateFromJson(json);
-      _$StreamManagementStateFromJson(json);
 }

packages/moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart

@@ -83,11 +83,7 @@ class StreamManagementManager extends XmppManagerBase {
   
   @override
   Future<bool> isSupported() async {
-    return getAttributes()
+    return getAttributes().getNegotiatorById<StreamManagementNegotiator>(streamManagementNegotiator)!.isSupported;
-        .getNegotiatorById<StreamManagementNegotiator>(
-          streamManagementNegotiator,
-        )!
-        .isSupported;
   }
   
   /// Returns the amount of stanzas waiting to get acked
@@ -227,8 +223,7 @@ class StreamManagementManager extends XmppManagerBase {
     _ackLock.synchronized(() async {
       final now = DateTime.now().millisecondsSinceEpoch;
 
-      if (now - _lastAckTimestamp >= ackTimeout.inMilliseconds &&
+      if (now - _lastAckTimestamp >= ackTimeout.inMilliseconds && _pendingAcks > 0) {
-          _pendingAcks > 0) {
         _stopAckTimer();
         await getAttributes().getConnection().reconnectionPolicy.onFailure();
       }
@@ -327,9 +322,7 @@ class StreamManagementManager extends XmppManagerBase {
         }
 
         if (h > _state.c2s) {
-        logger.info(
+          logger.info('C2S height jumped from ${_state.c2s} (local) to $h (remote).');
-          'C2S height jumped from ${_state.c2s} (local) to $h (remote).',
-        );
           // ignore: cascade_invocations
           logger.info('Proceeding with $h as local C2S counter.');
 
@@ -353,7 +346,6 @@ class StreamManagementManager extends XmppManagerBase {
         logger.fine('_incrementC2S: Releasing lock...');
     });
   }
-
   Future<void> _incrementS2C() async {
     logger.fine('_incrementS2C: Waiting to aquire lock...');
     await _stateLock.synchronized(() async {
@@ -365,19 +357,13 @@ class StreamManagementManager extends XmppManagerBase {
   }
   
   /// Called whenever we receive a stanza from the server.
-  Future<StanzaHandlerData> _onServerStanzaReceived(
+  Future<StanzaHandlerData> _onServerStanzaReceived(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     await _incrementS2C();
     return state;
   }
 
   /// Called whenever we send a stanza.
-  Future<StanzaHandlerData> _onClientStanzaSent(
+  Future<StanzaHandlerData> _onClientStanzaSent(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     await _incrementC2S();
     _unackedStanzas[_state.c2s] = stanza;
     

packages/moxxmpp/lib/src/xeps/xep_0203.dart

@@ -28,10 +28,7 @@ class DelayedDeliveryManager extends XmppManagerBase {
     ),
   ];
 
-  Future<StanzaHandlerData> _onIncomingMessage(
+  Future<StanzaHandlerData> _onIncomingMessage(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     final delay = stanza.firstTag('delay', xmlns: delayedDeliveryXmlns);
     if (delay == null) return state;
 

packages/moxxmpp/lib/src/xeps/xep_0280.dart

@@ -69,10 +69,7 @@ class CarbonsManager extends XmppManagerBase {
     }
   }
   
-  Future<StanzaHandlerData> _onMessageReceived(
+  Future<StanzaHandlerData> _onMessageReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final from = JID.fromString(message.attributes['from']! as String);
     final received = message.firstTag('received', xmlns: carbonsXmlns)!;
     if (!isCarbonValid(from)) return state.copyWith(done: true);
@@ -86,10 +83,7 @@ class CarbonsManager extends XmppManagerBase {
     );
   }
 
-  Future<StanzaHandlerData> _onMessageSent(
+  Future<StanzaHandlerData> _onMessageSent(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final from = JID.fromString(message.attributes['from']! as String);
     final sent = message.firstTag('sent', xmlns: carbonsXmlns)!;
     if (!isCarbonValid(from)) return state.copyWith(done: true);
@@ -178,8 +172,7 @@ class CarbonsManager extends XmppManagerBase {
   ///
   /// Returns true if the carbon is valid. Returns false if not.
   bool isCarbonValid(JID senderJid) {
-    return _isEnabled &&
+    return _isEnabled && getAttributes().getFullJID().bareCompare(
-        getAttributes().getFullJID().bareCompare(
       senderJid,
       ensureBare: true,
     );

packages/moxxmpp/lib/src/xeps/xep_0297.dart

@@ -4,10 +4,7 @@ import 'package:moxxmpp/src/stringxml.dart';
 
 /// Extracts the message stanza from the <forwarded /> node.
 Stanza unpackForwarded(XMLNode forwarded) {
-  assert(
+  assert(forwarded.attributes['xmlns'] == forwardedXmlns, 'Invalid element xmlns');
-    forwarded.attributes['xmlns'] == forwardedXmlns,
-    'Invalid element xmlns',
-  );
   assert(forwarded.tag == 'forwarded', 'Invalid element name');
 
   // NOTE: We only use this XEP (for now) in the context of Message Carbons

packages/moxxmpp/lib/src/xeps/xep_0300.dart

@@ -76,10 +76,7 @@ class CryptographicHashManager extends XmppManagerBase {
     '$hashFunctionNameBaseXmlns:$hashBlake2b512',
   ];
 
-  static Future<List<int>> hashFromData(
+  static Future<List<int>> hashFromData(List<int> data, HashFunction function) async {
-    List<int> data,
-    HashFunction function,
-  ) async {
     // TODO(PapaTutuWawa): Implement the others as well
     HashAlgorithm algo;
     switch (function) {

packages/moxxmpp/lib/src/xeps/xep_0308.dart

@@ -37,10 +37,7 @@ class LastMessageCorrectionManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     final edit = stanza.firstTag('replace', xmlns: lmcXmlns)!;
     return state.copyWith(
       lastMessageCorrectionSid: edit.attributes['id']! as String,

packages/moxxmpp/lib/src/xeps/xep_0333.dart

@@ -16,10 +16,7 @@ XMLNode makeChatMarkerMarkable() {
 }
 
 XMLNode makeChatMarker(String tag, String id) {
-  assert(
+  assert(['received', 'displayed', 'acknowledged'].contains(tag), 'Invalid chat marker');
-    ['received', 'displayed', 'acknowledged'].contains(tag),
-    'Invalid chat marker',
-  );
   return XMLNode.xmlns(
     tag: tag,
     xmlns: chatMarkersXmlns,
@@ -47,10 +44,7 @@ class ChatMarkerManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final marker = message.firstTagByXmlns(chatMarkersXmlns)!;
 
     // Handle the <markable /> explicitly
@@ -59,13 +53,11 @@ class ChatMarkerManager extends XmppManagerBase {
     if (!['received', 'displayed', 'acknowledged'].contains(marker.tag)) {
       logger.warning("Unknown message marker '${marker.tag}' found.");
     } else {
-      getAttributes().sendEvent(
+      getAttributes().sendEvent(ChatMarkerEvent(
-        ChatMarkerEvent(
           from: JID.fromString(message.from!),
           type: marker.tag,
           id: marker.attributes['id']! as String,
-        ),
+      ),);
-      );
     }
 
     return state.copyWith(done: true);

packages/moxxmpp/lib/src/xeps/xep_0334.dart

@@ -10,14 +10,10 @@ enum MessageProcessingHint {
 
 MessageProcessingHint messageProcessingHintFromXml(XMLNode element) {
   switch (element.tag) {
-    case 'no-permanent-store':
+    case 'no-permanent-store': return MessageProcessingHint.noPermanentStore;
-      return MessageProcessingHint.noPermanentStore;
+    case 'no-store': return MessageProcessingHint.noStore;
-    case 'no-store':
+    case 'no-copy': return MessageProcessingHint.noCopies;
-      return MessageProcessingHint.noStore;
+    case 'store': return MessageProcessingHint.store;
-    case 'no-copy':
-      return MessageProcessingHint.noCopies;
-    case 'store':
-      return MessageProcessingHint.store;
   }
     
   assert(false, 'Invalid Message Processing Hint: ${element.tag}');

packages/moxxmpp/lib/src/xeps/xep_0352.dart

@@ -7,18 +7,20 @@ import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
 
 class CSIActiveNonza extends XMLNode {
-  CSIActiveNonza()
+  CSIActiveNonza() : super(
-      : super(
     tag: 'active',
-          attributes: <String, String>{'xmlns': csiXmlns},
+    attributes: <String, String>{
+      'xmlns': csiXmlns
+    },
   );
 }
 
 class CSIInactiveNonza extends XMLNode {
-  CSIInactiveNonza()
+  CSIInactiveNonza() : super(
-      : super(
     tag: 'inactive',
-          attributes: <String, String>{'xmlns': csiXmlns},
+    attributes: <String, String>{
+      'xmlns': csiXmlns
+    },
   );
 }
 
@@ -31,9 +33,7 @@ class CSINegotiator extends XmppFeatureNegotiatorBase {
   bool get isSupported => _supported;
   
   @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
-    XMLNode nonza,
-  ) async {
     // negotiate is only called when the negotiator matched, meaning the server
     // advertises CSI.
     _supported = true;
@@ -56,9 +56,7 @@ class CSIManager extends XmppManagerBase {
 
   @override
   Future<bool> isSupported() async {
-    return getAttributes()
+    return getAttributes().getNegotiatorById<CSINegotiator>(csiNegotiator)!.isSupported;
-        .getNegotiatorById<CSINegotiator>(csiNegotiator)!
-        .isSupported;
   }
   
   /// To be called after a stream has been resumed as CSI does not

packages/moxxmpp/lib/src/xeps/xep_0359.dart

@@ -46,10 +46,7 @@ class StableIdManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final from = JID.fromString(message.attributes['from']! as String);
     String? originId;
     String? stanzaId;
@@ -77,14 +74,10 @@ class StableIdManager extends XmppManagerBase {
           stanzaId = stanzaIdTag.attributes['id']! as String;
           stanzaIdBy = stanzaIdTag.attributes['by']! as String;
         } else {
-          logger.finest(
+          logger.finest('${from.toString()} does not support $stableIdXmlns. Ignoring stanza id... ');
-            '${from.toString()} does not support $stableIdXmlns. Ignoring stanza id... ',
-          );
         }
       } else {
-        logger.finest(
+        logger.finest('Failed to find out if ${from.toString()} supports $stableIdXmlns. Ignoring... ');
-          'Failed to find out if ${from.toString()} supports $stableIdXmlns. Ignoring... ',
-        );
       }
     }
 

packages/moxxmpp/lib/src/xeps/xep_0363/xep_0363.dart

@@ -58,10 +58,7 @@ class HttpFileUploadManager extends XmppManagerBase {
   /// Returns whether the entity provided an identity that tells us that we can ask it
   /// for an HTTP upload slot.
   bool _containsFileUploadIdentity(DiscoInfo info) {
-    return listContains(
+    return listContains(info.identities, (Identity id) => id.category == 'store' && id.type == 'file');
-      info.identities,
-      (Identity id) => id.category == 'store' && id.type == 'file',
-    );
   }
 
   /// Extract the maximum filesize in octets from the disco response. Returns null
@@ -95,9 +92,7 @@ class HttpFileUploadManager extends XmppManagerBase {
   Future<bool> isSupported() async {
     if (_gotSupported) return _supported;
     
-    final result = await getAttributes()
+    final result = await getAttributes().getManagerById<DiscoManager>(discoManager)!.performDiscoSweep();
-        .getManagerById<DiscoManager>(discoManager)!
-        .performDiscoSweep();
     if (result.isType<DiscoError>()) {
       _gotSupported = false;
       _supported = false;
@@ -107,8 +102,7 @@ class HttpFileUploadManager extends XmppManagerBase {
     final infos = result.get<List<DiscoInfo>>();
     _gotSupported = true;
     for (final info in infos) {
-      if (_containsFileUploadIdentity(info) &&
+      if (_containsFileUploadIdentity(info) && info.features.contains(httpFileUploadXmlns)) {
-          info.features.contains(httpFileUploadXmlns)) {
          logger.info('Discovered HTTP File Upload for ${info.jid}');
 
         _entityJid = info.jid;
@@ -125,26 +119,16 @@ class HttpFileUploadManager extends XmppManagerBase {
   /// the file's size in octets. [contentType] is optional and refers to the file's
   /// Mime type.
   /// Returns an [HttpFileUploadSlot] if the request was successful; null otherwise.
-  Future<Result<HttpFileUploadSlot, HttpFileUploadError>> requestUploadSlot(
+  Future<Result<HttpFileUploadSlot, HttpFileUploadError>> requestUploadSlot(String filename, int filesize, { String? contentType }) async {
-    String filename,
+    if (!(await isSupported())) return Result(NoEntityKnownError());
-    int filesize, {
-    String? contentType,
-  }) async {
-    if (!(await isSupported())) {
-      return Result(NoEntityKnownError());
-    }
 
     if (_entityJid == null) {
-      logger.warning(
+      logger.warning('Attempted to request HTTP File Upload slot but no entity is known to send this request to.');
-        'Attempted to request HTTP File Upload slot but no entity is known to send this request to.',
-      );
       return Result(NoEntityKnownError());
     }
 
     if (_maxUploadSize != null && filesize > _maxUploadSize!) {
-      logger.warning(
+      logger.warning('Attempted to request HTTP File Upload slot for a file that exceeds the filesize limit');
-        'Attempted to request HTTP File Upload slot for a file that exceeds the filesize limit',
-      );
       return Result(FileTooBigError());
     }
     

packages/moxxmpp/lib/src/xeps/xep_0380.dart

@@ -18,39 +18,25 @@ enum ExplicitEncryptionType {
 
 String _explicitEncryptionTypeToString(ExplicitEncryptionType type) {
   switch (type) {
-    case ExplicitEncryptionType.otr:
+    case ExplicitEncryptionType.otr: return emeOtr;
-      return emeOtr;
+    case ExplicitEncryptionType.legacyOpenPGP: return emeLegacyOpenPGP;
-    case ExplicitEncryptionType.legacyOpenPGP:
+    case ExplicitEncryptionType.openPGP: return emeOpenPGP;
-      return emeLegacyOpenPGP;
+    case ExplicitEncryptionType.omemo: return emeOmemo;
-    case ExplicitEncryptionType.openPGP:
+    case ExplicitEncryptionType.omemo1: return emeOmemo1;
-      return emeOpenPGP;
+    case ExplicitEncryptionType.omemo2: return emeOmemo2;
-    case ExplicitEncryptionType.omemo:
+    case ExplicitEncryptionType.unknown: return '';
-      return emeOmemo;
-    case ExplicitEncryptionType.omemo1:
-      return emeOmemo1;
-    case ExplicitEncryptionType.omemo2:
-      return emeOmemo2;
-    case ExplicitEncryptionType.unknown:
-      return '';
   }
 }
 
 ExplicitEncryptionType _explicitEncryptionTypeFromString(String str) {
   switch (str) {
-    case emeOtr:
+    case emeOtr: return ExplicitEncryptionType.otr;
-      return ExplicitEncryptionType.otr;
+    case emeLegacyOpenPGP: return ExplicitEncryptionType.legacyOpenPGP;
-    case emeLegacyOpenPGP:
+    case emeOpenPGP: return ExplicitEncryptionType.openPGP;
-      return ExplicitEncryptionType.legacyOpenPGP;
+    case emeOmemo: return ExplicitEncryptionType.omemo;
-    case emeOpenPGP:
+    case emeOmemo1: return ExplicitEncryptionType.omemo1;
-      return ExplicitEncryptionType.openPGP;
+    case emeOmemo2: return ExplicitEncryptionType.omemo2;
-    case emeOmemo:
+    default: return ExplicitEncryptionType.unknown;
-      return ExplicitEncryptionType.omemo;
-    case emeOmemo1:
-      return ExplicitEncryptionType.omemo1;
-    case emeOmemo2:
-      return ExplicitEncryptionType.omemo2;
-    default:
-      return ExplicitEncryptionType.unknown;
   }
 }
 
@@ -85,10 +71,7 @@ class EmeManager extends XmppManagerBase {
     ),
   ];
 
-  Future<StanzaHandlerData> _onStanzaReceived(
+  Future<StanzaHandlerData> _onStanzaReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final encryption = message.firstTag('encryption', xmlns: emeXmlns)!;
 
     return state.copyWith(

packages/moxxmpp/lib/src/xeps/xep_0384/crypto.dart

@@ -15,7 +15,6 @@ bool checkAffixElements(XMLNode envelope, String sender, JID ourJid) {
   if (to == null) return false;
   final encReceiver = JID.fromString(to);
 
-  return encSender.toBare().toString() ==
+  return encSender.toBare().toString() == JID.fromString(sender).toBare().toString() &&
-          JID.fromString(sender).toBare().toString() &&
     encReceiver.toBare().toString() == ourJid.toBare().toString();
 }

packages/moxxmpp/lib/src/xeps/xep_0384/helpers.dart

@@ -46,8 +46,7 @@ XMLNode bundleToXML(OmemoBundle bundle) {
   for (final pk in bundle.opksEncoded.entries) {
     prekeys.add(
       XMLNode(
-        tag: 'pk',
+        tag: 'pk', attributes: <String, String>{
-        attributes: <String, String>{
           'id': '${pk.key}',
         },
         text: pk.value,

packages/moxxmpp/lib/src/xeps/xep_0384/types.dart

@@ -1,5 +1,6 @@
 /// A simple wrapper class for defining elements that should not be encrypted.
 class DoNotEncrypt {
+
   const DoNotEncrypt(this.tag, this.xmlns);
   final String tag;
   final String xmlns;

packages/moxxmpp/lib/src/xeps/xep_0384/xep_0384.dart

@@ -113,7 +113,8 @@ abstract class BaseOmemoManager extends XmppManagerBase {
       }
 
       // Tell the OmemoManager
-      (await getOmemoManager()).onDeviceListUpdate(jid.toString(), ids);
+      (await getOmemoManager())
+        .onDeviceListUpdate(jid.toString(), ids);
 
       // Generate an event
       getAttributes().sendEvent(OmemoDeviceListUpdatedEvent(jid, ids));
@@ -123,6 +124,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
   @visibleForOverriding
   Future<OmemoManager> getOmemoManager();
 
+  
   /// Wrapper around using getSessionManager and then calling getDeviceId on it.
   Future<int> _getDeviceId() async => (await getOmemoManager()).getDeviceId();
 
@@ -167,6 +169,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
           tag: 'content',
           children: children,
         ),
+
         XMLNode(
           tag: 'rpad',
           text: generateRpad(),
@@ -198,11 +201,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     return payload.toXml();
   }
 
-  XMLNode _buildEncryptedElement(
+  XMLNode _buildEncryptedElement(EncryptionResult result, String recipientJid, int deviceId) {
-    EncryptionResult result,
-    String recipientJid,
-    int deviceId,
-  ) {
     final keyElements = <String, List<XMLNode>>{};
     for (final key in result.encryptedKeys) {
       final keyElement = XMLNode(
@@ -258,10 +257,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
   }
 
   /// For usage with omemo_dart's OmemoManager.
-  Future<void> sendEmptyMessageImpl(
+  Future<void> sendEmptyMessageImpl(EncryptionResult result, String toJid) async {
-    EncryptionResult result,
-    String toJid,
-  ) async {
     await getAttributes().sendStanza(
       Stanza.message(
         to: toJid,
@@ -306,10 +302,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     return result.get<OmemoBundle>();
   }
   
-  Future<StanzaHandlerData> _onOutgoingStanza(
+  Future<StanzaHandlerData> _onOutgoingStanza(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     if (state.encrypted) {
       logger.finest('Not encrypting since state.encrypted is true');
       return state;
@@ -324,14 +317,10 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     final toJid = JID.fromString(stanza.to!).toBare();
     final shouldEncryptResult = await shouldEncryptStanza(toJid, stanza);
     if (!shouldEncryptResult && !state.forceEncryption) {
-      logger.finest(
+      logger.finest('Not encrypting stanza for $toJid: Both shouldEncryptStanza and forceEncryption are false.');
-        'Not encrypting stanza for $toJid: Both shouldEncryptStanza and forceEncryption are false.',
-      );
       return state;
     } else {
-      logger.finest(
+      logger.finest('Encrypting stanza for $toJid: shouldEncryptResult=$shouldEncryptResult, forceEncryption=${state.forceEncryption}');
-        'Encrypting stanza for $toJid: shouldEncryptResult=$shouldEncryptResult, forceEncryption=${state.forceEncryption}',
-      );
     }
 
     final toEncrypt = List<XMLNode>.empty(growable: true);
@@ -346,15 +335,14 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     
     logger.finest('Beginning encryption');
     final carbonsEnabled = getAttributes()
-            .getManagerById<CarbonsManager>(carbonsManager)
+      .getManagerById<CarbonsManager>(carbonsManager)?.isEnabled ?? false;
-            ?.isEnabled ??
-        false;
     final om = await getOmemoManager();
     final result = await om.onOutgoingStanza(
       OmemoOutgoingStanza(
         [
           toJid.toString(),
-          if (carbonsEnabled) getAttributes().getFullJID().toBare().toString(),
+          if (carbonsEnabled)
+            getAttributes().getFullJID().toBare().toString(),
         ],
         _buildEnvelope(toEncrypt, toJid.toString()),
       ),
@@ -369,10 +357,9 @@ abstract class BaseOmemoManager extends XmppManagerBase {
         other: other,
         // If we have no device list for toJid, then the contact most likely does not
         // support OMEMO:2
-        cancelReason: result.jidEncryptionErrors[toJid.toString()]
+        cancelReason: result.jidEncryptionErrors[toJid.toString()] is NoKeyMaterialAvailableException ?
-                is NoKeyMaterialAvailableException
+          OmemoNotSupportedForContactException() :
-            ? OmemoNotSupportedForContactException()
+          UnknownOmemoError(),
-            : UnknownOmemoError(),
         cancel: true,
       );
     }
@@ -409,10 +396,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
   @visibleForOverriding
   Future<bool> shouldEncryptStanza(JID toJid, Stanza stanza);
   
-  Future<StanzaHandlerData> _onIncomingStanza(
+  Future<StanzaHandlerData> _onIncomingStanza(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     final encrypted = stanza.firstTag('encrypted', xmlns: omemoXmlns);
     if (encrypted == null) return state;
     if (stanza.from == null) return state;
@@ -443,8 +427,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
       OmemoIncomingStanza(
         fromJid.toString(),
         sid,
-        state.delayedDelivery?.timestamp.millisecondsSinceEpoch ??
+        state.delayedDelivery?.timestamp.millisecondsSinceEpoch ?? DateTime.now().millisecondsSinceEpoch,
-            DateTime.now().millisecondsSinceEpoch,
         keys,
         payloadElement?.innerText(),
       ),
@@ -455,13 +438,9 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     if (result.error != null) {
       other['encryption_error'] = result.error;
     } else {
-      children = stanza.children
+      children = stanza.children.where(
-          .where(
+        (child) => child.tag != 'encrypted' || child.attributes['xmlns'] != omemoXmlns,
-            (child) =>
+      ).toList();
-                child.tag != 'encrypted' ||
-                child.attributes['xmlns'] != omemoXmlns,
-          )
-          .toList();
     }
 
     if (result.payload != null) {
@@ -511,12 +490,9 @@ abstract class BaseOmemoManager extends XmppManagerBase {
   /// device list PubSub node.
   ///
   /// On success, returns the XML data. On failure, returns an OmemoError.
-  Future<Result<OmemoError, XMLNode>> _retrieveDeviceListPayload(
+  Future<Result<OmemoError, XMLNode>> _retrieveDeviceListPayload(JID jid) async {
-    JID jid,
-  ) async {
     final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
-    final result =
+    final result = await pm.getItems(jid.toBare().toString(), omemoDevicesXmlns);
-        await pm.getItems(jid.toBare().toString(), omemoDevicesXmlns);
     if (result.isType<PubSubError>()) return Result(UnknownOmemoError());
     return Result(result.get<List<PubSubItem>>().first.payload);
   }
@@ -526,9 +502,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     final itemsRaw = await _retrieveDeviceListPayload(jid);
     if (itemsRaw.isType<OmemoError>()) return Result(UnknownOmemoError());
 
-    final ids = itemsRaw
+    final ids = itemsRaw.get<XMLNode>().children
-        .get<XMLNode>()
-        .children
       .map((child) => int.parse(child.attributes['id']! as String))
       .toList();
     return Result(ids);
@@ -537,20 +511,15 @@ abstract class BaseOmemoManager extends XmppManagerBase {
   /// Retrieve all device bundles for the JID [jid].
   ///
   /// On success, returns a list of devices. On failure, returns am OmemoError.
-  Future<Result<OmemoError, List<OmemoBundle>>> retrieveDeviceBundles(
+  Future<Result<OmemoError, List<OmemoBundle>>> retrieveDeviceBundles(JID jid) async {
-    JID jid,
-  ) async {
     // TODO(Unknown): Should we query the device list first?
     final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
     final bundlesRaw = await pm.getItems(jid.toString(), omemoBundlesXmlns);
     if (bundlesRaw.isType<PubSubError>()) return Result(UnknownOmemoError());
 
-    final bundles = bundlesRaw
+    final bundles = bundlesRaw.get<List<PubSubItem>>().map(
-        .get<List<PubSubItem>>()
-        .map(
       (bundle) => bundleFromXML(jid, int.parse(bundle.id), bundle.payload),
-        )
+    ).toList();
-        .toList();
 
     return Result(bundles);
   }
@@ -558,10 +527,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
   /// Retrieves a bundle from entity [jid] with the device id [deviceId].
   ///
   /// On success, returns the device bundle. On failure, returns an OmemoError.
-  Future<Result<OmemoError, OmemoBundle>> retrieveDeviceBundle(
+  Future<Result<OmemoError, OmemoBundle>> retrieveDeviceBundle(JID jid, int deviceId) async {
-    JID jid,
-    int deviceId,
-  ) async {
     final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
     final bareJid = jid.toBare().toString();
     final item = await pm.getItem(bareJid, omemoBundlesXmlns, '$deviceId');
@@ -652,8 +618,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     if (items.isType<DiscoError>()) return Result(UnknownOmemoError());
 
     final nodes = items.get<List<DiscoItem>>();
-    final result = nodes.any((item) => item.node == omemoDevicesXmlns) &&
+    final result = nodes.any((item) => item.node == omemoDevicesXmlns) && nodes.any((item) => item.node == omemoBundlesXmlns);
-        nodes.any((item) => item.node == omemoBundlesXmlns);
     return Result(result);
   }
 

packages/moxxmpp/lib/src/xeps/xep_0385.dart

@@ -8,14 +8,7 @@ import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/xeps/staging/extensible_file_thumbnails.dart';
 
 class StatelessMediaSharingData {
-  const StatelessMediaSharingData({
+  const StatelessMediaSharingData({ required this.mediaType, required this.size, required this.description, required this.hashes, required this.url, required this.thumbnails });
-    required this.mediaType,
-    required this.size,
-    required this.description,
-    required this.hashes,
-    required this.url,
-    required this.thumbnails,
-  });
   final String mediaType;
   final int size;
   final String description;
@@ -36,8 +29,7 @@ StatelessMediaSharingData parseSIMSElement(XMLNode node) {
   }
 
   var url = '';
-  final references =
+  final references = file.firstTag('sources')!.findTags('reference', xmlns: referenceXmlns);
-      file.firstTag('sources')!.findTags('reference', xmlns: referenceXmlns);
   for (final i in references) {
     if (i.attributes['type'] != 'data') continue;
 
@@ -51,8 +43,7 @@ StatelessMediaSharingData parseSIMSElement(XMLNode node) {
   final thumbnails = List<Thumbnail>.empty(growable: true);
   for (final child in file.children) {
     // TODO(Unknown): Handle other thumbnails
-    if (child.tag == 'file-thumbnail' &&
+    if (child.tag == 'file-thumbnail' && child.attributes['xmlns'] == fileThumbnailsXmlns) {
-        child.attributes['xmlns'] == fileThumbnailsXmlns) {
       final thumb = parseFileThumbnailElement(child);
       if (thumb != null) {
         thumbnails.add(thumb);
@@ -91,10 +82,7 @@ class SIMSManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final references = message.findTags('reference', xmlns: referenceXmlns);
     for (final ref in references) {
       final sims = ref.firstTag('media-sharing', xmlns: simsXmlns);

packages/moxxmpp/lib/src/xeps/xep_0414.dart

@@ -1,6 +1,7 @@
 import 'package:cryptography/cryptography.dart';
 
 class InvalidHashAlgorithmException implements Exception {
+
   InvalidHashAlgorithmException(this.name);
   final String name;
 
@@ -10,20 +11,16 @@ class InvalidHashAlgorithmException implements Exception {
 /// Returns the hash algorithm specified by its name, according to XEP-0414.
 HashAlgorithm? getHashByName(String name) {
   switch (name) {
-    case 'sha-1':
+    case 'sha-1': return Sha1();
-      return Sha1();
+    case 'sha-256': return Sha256();
-    case 'sha-256':
+    case 'sha-512': return Sha512();
-      return Sha256();
-    case 'sha-512':
-      return Sha512();
     // NOTE: cryptography provides an implementation of blake2b, however,
     //       I have no idea what it's output length is and you cannot set
     //       one. => New dependency
     // TODO(Unknown): Implement
     //case "blake2b-256": ;
     // hashLengthInBytes == 64 => 512?
-    case 'blake2b-512':
+    case 'blake2b-512': Blake2b();
-      Blake2b();
     // NOTE: cryptography does not provide SHA3 hashes => New dependency
     // TODO(Unknown): Implement
     //case "sha3-256": ;

packages/moxxmpp/lib/src/xeps/xep_0424.dart

@@ -30,10 +30,7 @@ class MessageRetractionManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final applyTo = message.firstTag('apply-to', xmlns: fasteningXmlns);
     if (applyTo == null) {
       return state;
@@ -44,13 +41,14 @@ class MessageRetractionManager extends XmppManagerBase {
       return state;
     }
 
-    final isFallbackBody =
+    final isFallbackBody = message.firstTag('fallback', xmlns: fallbackIndicationXmlns) != null;
-        message.firstTag('fallback', xmlns: fallbackIndicationXmlns) != null;
 
     return state.copyWith(
       messageRetraction: MessageRetractionData(
         applyTo.attributes['id']! as String,
-        isFallbackBody ? message.firstTag('body')?.innerText() : null,
+        isFallbackBody ?
+          message.firstTag('body')?.innerText() :
+          null,
       ),
     );
   }

packages/moxxmpp/lib/src/xeps/xep_0444.dart

@@ -49,12 +49,8 @@ class MessageReactionsManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
  
-  Future<StanzaHandlerData> _onReactionsReceived(
+  Future<StanzaHandlerData> _onReactionsReceived(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
+    final reactionsElement = message.firstTag('reactions', xmlns: messageReactionsXmlns)!;
-    StanzaHandlerData state,
-  ) async {
-    final reactionsElement =
-        message.firstTag('reactions', xmlns: messageReactionsXmlns)!;
     return state.copyWith(
       messageReactions: MessageReactions(
         reactionsElement.attributes['id']! as String,

packages/moxxmpp/lib/src/xeps/xep_0446.dart

@@ -18,18 +18,13 @@ class FileMetadataData {
 
   /// Parse [node] as a FileMetadataData element.
   factory FileMetadataData.fromXML(XMLNode node) {
-    assert(
+    assert(node.attributes['xmlns'] == fileMetadataXmlns, 'Invalid element xmlns');
-      node.attributes['xmlns'] == fileMetadataXmlns,
-      'Invalid element xmlns',
-    );
     assert(node.tag == 'file', 'Invalid element anme');
 
     final lengthElement = node.firstTag('length');
-    final length =
+    final length = lengthElement != null ? int.parse(lengthElement.innerText()) : null;
-        lengthElement != null ? int.parse(lengthElement.innerText()) : null;
     final sizeElement = node.firstTag('size');
-    final size =
+    final size = sizeElement != null ? int.parse(sizeElement.innerText()) : null;
-        sizeElement != null ? int.parse(sizeElement.innerText()) : null;
 
     final hashes = <String, String>{};
     for (final e in node.findTags('hash')) {
@@ -87,27 +82,13 @@ class FileMetadataData {
       children: List.empty(growable: true),
     );
 
-    if (mediaType != null) {
+    if (mediaType != null) node.addChild(XMLNode(tag: 'media-type', text: mediaType));
-      node.addChild(XMLNode(tag: 'media-type', text: mediaType));
+    if (width != null) node.addChild(XMLNode(tag: 'width', text: '$width'));
-    }
+    if (height != null) node.addChild(XMLNode(tag: 'height', text: '$height'));
-    if (width != null) {
+    if (desc != null) node.addChild(XMLNode(tag: 'desc', text: desc));
-      node.addChild(XMLNode(tag: 'width', text: '$width'));
+    if (length != null) node.addChild(XMLNode(tag: 'length', text: length.toString()));
-    }
+    if (name != null) node.addChild(XMLNode(tag: 'name', text: name));
-    if (height != null) {
+    if (size != null) node.addChild(XMLNode(tag: 'size', text: size.toString()));
-      node.addChild(XMLNode(tag: 'height', text: '$height'));
-    }
-    if (desc != null) {
-      node.addChild(XMLNode(tag: 'desc', text: desc));
-    }
-    if (length != null) {
-      node.addChild(XMLNode(tag: 'length', text: length.toString()));
-    }
-    if (name != null) {
-      node.addChild(XMLNode(tag: 'name', text: name));
-    }
-    if (size != null) {
-      node.addChild(XMLNode(tag: 'size', text: size.toString()));
-    }
 
     for (final hash in hashes.entries) {
       node.addChild(

packages/moxxmpp/lib/src/xeps/xep_0447.dart

@@ -21,14 +21,9 @@ class StatelessFileSharingUrlSource extends StatelessFileSharingSource {
   StatelessFileSharingUrlSource(this.url);
 
   factory StatelessFileSharingUrlSource.fromXml(XMLNode element) {
-    assert(
+    assert(element.attributes['xmlns'] == urlDataXmlns, 'Element has the wrong xmlns');
-      element.attributes['xmlns'] == urlDataXmlns,
-      'Element has the wrong xmlns',
-    );
 
-    return StatelessFileSharingUrlSource(
+    return StatelessFileSharingUrlSource(element.attributes['target']! as String);
-      element.attributes['target']! as String,
-    );
   }
 
   final String url;
@@ -49,10 +44,7 @@ class StatelessFileSharingUrlSource extends StatelessFileSharingSource {
 /// StatelessFileSharingSources contained with it.
 /// If [checkXmlns] is true, then the sources element must also have an xmlns attribute
 /// of "urn:xmpp:sfs:0".
-List<StatelessFileSharingSource> processStatelessFileSharingSources(
+List<StatelessFileSharingSource> processStatelessFileSharingSources(XMLNode node, { bool checkXmlns = true }) {
-  XMLNode node, {
-  bool checkXmlns = true,
-}) {
   final sources = List<StatelessFileSharingSource>.empty(growable: true);
   
   final sourcesElement = node.firstTag(
@@ -96,7 +88,9 @@ class StatelessFileSharingData {
         metadata.toXML(),
         XMLNode(
           tag: 'sources',
-          children: sources.map((source) => source.toXml()).toList(),
+          children: sources
+            .map((source) => source.toXml())
+            .toList(),
         ),
       ],
     );
@@ -105,8 +99,7 @@ class StatelessFileSharingData {
   StatelessFileSharingUrlSource? getFirstUrlSource() {
     return firstWhereOrNull(
       sources,
-      (StatelessFileSharingSource source) =>
+      (StatelessFileSharingSource source) => source is StatelessFileSharingUrlSource,
-          source is StatelessFileSharingUrlSource,
     ) as StatelessFileSharingUrlSource?;
   }
 }
@@ -129,16 +122,11 @@ class SFSManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza message, StanzaHandlerData state) async {
-    Stanza message,
-    StanzaHandlerData state,
-  ) async {
     final sfs = message.firstTag('file-sharing', xmlns: sfsXmlns)!;
 
     return state.copyWith(
-      sfs: StatelessFileSharingData.fromXML(
+      sfs: StatelessFileSharingData.fromXML(sfs, ),
-        sfs,
-      ),
     );
   }
 }

packages/moxxmpp/lib/src/xeps/xep_0448.dart

@@ -38,18 +38,10 @@ SFSEncryptionType encryptionTypeFromNamespace(String xmlns) {
 }
 
 class StatelessFileSharingEncryptedSource extends StatelessFileSharingSource {
-  StatelessFileSharingEncryptedSource(
+
-    this.encryption,
+  StatelessFileSharingEncryptedSource(this.encryption, this.key, this.iv, this.hashes, this.source);
-    this.key,
-    this.iv,
-    this.hashes,
-    this.source,
-  );
   factory StatelessFileSharingEncryptedSource.fromXml(XMLNode element) {
-    assert(
+    assert(element.attributes['xmlns'] == sfsEncryptionXmlns, 'Element has invalid xmlns');
-      element.attributes['xmlns'] == sfsEncryptionXmlns,
-      'Element has invalid xmlns',
-    );
 
     final key = base64Decode(element.firstTag('key')!.text!);
     final iv = base64Decode(element.firstTag('iv')!.text!);
@@ -58,8 +50,7 @@ class StatelessFileSharingEncryptedSource extends StatelessFileSharingSource {
     // Find the first URL source
     final source = firstWhereOrNull(
       sources,
-      (XMLNode child) =>
+      (XMLNode child) => child.tag == 'url-data' && child.attributes['xmlns'] == urlDataXmlns,
-          child.tag == 'url-data' && child.attributes['xmlns'] == urlDataXmlns,
     )!;
 
     // Find hashes
@@ -100,8 +91,7 @@ class StatelessFileSharingEncryptedSource extends StatelessFileSharingSource {
           tag: 'iv',
           text: base64Encode(iv),
         ),
-        ...hashes.entries
+        ...hashes.entries.map((hash) => constructHashElement(hash.key, hash.value)),
-            .map((hash) => constructHashElement(hash.key, hash.value)),
         XMLNode.xmlns(
           tag: 'sources',
           xmlns: sfsXmlns,

packages/moxxmpp/lib/src/xeps/xep_0449.dart

@@ -22,9 +22,7 @@ class Sticker {
     assert(node.tag == 'item', 'sticker has wrong tag');
 
     return Sticker(
-      FileMetadataData.fromXML(
+      FileMetadataData.fromXML(node.firstTag('file', xmlns: fileMetadataXmlns)!),
-        node.firstTag('file', xmlns: fileMetadataXmlns)!,
-      ),
       processStatelessFileSharingSources(node, checkXmlns: false),
       {},
     );
@@ -75,11 +73,7 @@ class StickerPack {
     this.restricted,
   );
 
-  factory StickerPack.fromXML(
+  factory StickerPack.fromXML(String id, XMLNode node, { bool hashAvailable = true }) {
-    String id,
-    XMLNode node, {
-    bool hashAvailable = true,
-  }) {
     assert(node.tag == 'pack', 'node has wrong tag');
     assert(node.attributes['xmlns'] == stickersXmlns, 'node has wrong XMLNS');
 
@@ -148,10 +142,13 @@ class StickerPack {
           hashValue,
         ),
 
-        ...restricted ? [XMLNode(tag: 'restricted')] : [],
+        ...restricted ?
+          [XMLNode(tag: 'restricted')] :
+          [],
         
         // Stickers
-        ...stickers.map((sticker) => sticker.toPubSubXML()),
+        ...stickers
+          .map((sticker) => sticker.toPubSubXML()),
       ],
     );
   }
@@ -244,10 +241,7 @@ class StickersManager extends XmppManagerBase {
     ),
   ];
 
-  Future<StanzaHandlerData> _onIncomingMessage(
+  Future<StanzaHandlerData> _onIncomingMessage(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     final sticker = stanza.firstTag('sticker', xmlns: stickersXmlns)!;
     return state.copyWith(
       stickerPackId: sticker.attributes['pack']! as String,
@@ -258,11 +252,7 @@ class StickersManager extends XmppManagerBase {
   /// [accessModel] will be used as the PubSub node's access model.
   ///
   /// On success, returns true. On failure, returns a PubSubError.
-  Future<Result<PubSubError, bool>> publishStickerPack(
+  Future<Result<PubSubError, bool>> publishStickerPack(JID jid, StickerPack pack, { String? accessModel }) async {
-    JID jid,
-    StickerPack pack, {
-    String? accessModel,
-  }) async {
     assert(pack.id != '', 'The sticker pack must have an id');
     final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
 
@@ -281,10 +271,7 @@ class StickersManager extends XmppManagerBase {
   /// Removes the sticker pack with id [id] from the PubSub node of [jid].
   ///
   /// On success, returns the true. On failure, returns a PubSubError.
-  Future<Result<PubSubError, bool>> retractStickerPack(
+  Future<Result<PubSubError, bool>> retractStickerPack(JID jid, String id) async {
-    JID jid,
-    String id,
-  ) async {
     final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
 
     return pm.retract(
@@ -297,10 +284,7 @@ class StickersManager extends XmppManagerBase {
   /// Fetches the sticker pack with id [id] from [jid].
   ///
   /// On success, returns the StickerPack. On failure, returns a PubSubError.
-  Future<Result<PubSubError, StickerPack>> fetchStickerPack(
+  Future<Result<PubSubError, StickerPack>> fetchStickerPack(JID jid, String id) async {
-    JID jid,
-    String id,
-  ) async {
     final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
     final stickerPackDataRaw = await pm.getItem(
       jid.toBare().toString(),

packages/moxxmpp/lib/src/xeps/xep_0461.dart

@@ -45,7 +45,10 @@ class QuoteData {
   /// Takes the body of the message we want to quote [quoteBody] and the content of
   /// the reply [body] and computes the fallback body and its length.
   factory QuoteData.fromBodies(String quoteBody, String body) {
-    final fallback = quoteBody.split('\n').map((line) => '> $line\n').join();
+    final fallback = quoteBody
+      .split('\n')
+      .map((line) => '> $line\n')
+      .join();
 
     return QuoteData(
       '$fallback$body',
@@ -85,10 +88,7 @@ class MessageRepliesManager extends XmppManagerBase {
   @override
   Future<bool> isSupported() async => true;
   
-  Future<StanzaHandlerData> _onMessage(
+  Future<StanzaHandlerData> _onMessage(Stanza stanza, StanzaHandlerData state) async {
-    Stanza stanza,
-    StanzaHandlerData state,
-  ) async {
     final reply = stanza.firstTag('reply', xmlns: replyXmlns)!;
     final id = reply.attributes['id']! as String;
     final to = reply.attributes['to'] as String?;

packages/moxxmpp/test/xeps/xep_0060_test.dart

@@ -1,172 +0,0 @@
-import 'package:moxxmpp/moxxmpp.dart';
-import 'package:test/test.dart';
-
-import '../helpers/logging.dart';
-import '../helpers/xmpp.dart';
-
-class StubbedDiscoManager extends DiscoManager {
-  StubbedDiscoManager() : super([]);
-
-  @override
-  Future<Result<DiscoError, DiscoInfo>> discoInfoQuery(String entity, { String? node, bool shouldEncrypt = true }) async {
-    final result = DiscoInfo.fromQuery(
-      XMLNode.fromString(
-        '''<query xmlns='http://jabber.org/protocol/disco#info'>
-<identity category='account' type='registered'/>
-<identity type='service' category='pubsub' name='PubSub acs-clustered'/>
-<feature var='http://jabber.org/protocol/pubsub#retrieve-default'/>
-<feature var='http://jabber.org/protocol/pubsub#purge-nodes'/>
-<feature var='http://jabber.org/protocol/pubsub#subscribe'/>
-<feature var='http://jabber.org/protocol/pubsub#member-affiliation'/>
-<feature var='http://jabber.org/protocol/pubsub#subscription-notifications'/>
-<feature var='http://jabber.org/protocol/pubsub#create-nodes'/>
-<feature var='http://jabber.org/protocol/pubsub#outcast-affiliation'/>
-<feature var='http://jabber.org/protocol/pubsub#get-pending'/>
-<feature var='http://jabber.org/protocol/pubsub#presence-notifications'/>
-<feature var='urn:xmpp:ping'/>
-<feature var='http://jabber.org/protocol/pubsub#delete-nodes'/>
-<feature var='http://jabber.org/protocol/pubsub#config-node'/>
-<feature var='http://jabber.org/protocol/pubsub#retrieve-items'/>
-<feature var='http://jabber.org/protocol/pubsub#access-whitelist'/>
-<feature var='http://jabber.org/protocol/pubsub#access-presence'/>
-<feature var='http://jabber.org/protocol/disco#items'/>
-<feature var='http://jabber.org/protocol/pubsub#meta-data'/>
-<feature var='http://jabber.org/protocol/pubsub#multi-items'/>
-<feature var='http://jabber.org/protocol/pubsub#item-ids'/>
-<feature var='urn:xmpp:mam:1'/>
-<feature var='http://jabber.org/protocol/pubsub#instant-nodes'/>
-<feature var='urn:xmpp:mam:2'/>
-<feature var='urn:xmpp:mam:2#extended'/>
-<feature var='http://jabber.org/protocol/pubsub#modify-affiliations'/>
-<feature var='http://jabber.org/protocol/pubsub#multi-collection'/>
-<feature var='http://jabber.org/protocol/pubsub#persistent-items'/>
-<feature var='http://jabber.org/protocol/pubsub#create-and-configure'/>
-<feature var='http://jabber.org/protocol/pubsub#publisher-affiliation'/>
-<feature var='http://jabber.org/protocol/pubsub#access-open'/>
-<feature var='http://jabber.org/protocol/pubsub#retrieve-affiliations'/>
-<feature var='http://jabber.org/protocol/pubsub#access-authorize'/>
-<feature var='jabber:iq:version'/>
-<feature var='http://jabber.org/protocol/pubsub#retract-items'/>
-<feature var='http://jabber.org/protocol/pubsub#manage-subscriptions'/>
-<feature var='http://jabber.org/protocol/commands'/>
-<feature var='http://jabber.org/protocol/pubsub#auto-subscribe'/>
-<feature var='http://jabber.org/protocol/pubsub#publish-options'/>
-<feature var='http://jabber.org/protocol/pubsub#access-roster'/>
-<feature var='http://jabber.org/protocol/pubsub#publish'/>
-<feature var='http://jabber.org/protocol/pubsub#collections'/>
-<feature var='http://jabber.org/protocol/pubsub#retrieve-subscriptions'/>
-<feature var='http://jabber.org/protocol/disco#info'/>
-<x type='result' xmlns='jabber:x:data'>
-<field type='hidden' var='FORM_TYPE'>
-<value>http://jabber.org/network/serverinfo</value>
-</field>
-<field type='list-multi' var='abuse-addresses'>
-<value>mailto:support@tigase.net</value>
-<value>xmpp:tigase@mix.tigase.im</value>
-<value>xmpp:tigase@muc.tigase.org</value>
-<value>https://tigase.net/technical-support</value>
-</field>
-</x>
-<feature var='http://jabber.org/protocol/pubsub#auto-create'/>
-<feature var='http://jabber.org/protocol/pubsub#auto-subscribe'/>
-<feature var='urn:xmpp:mix:pam:2'/>
-<feature var='urn:xmpp:carbons:2'/>
-<feature var='urn:xmpp:carbons:rules:0'/>
-<feature var='jabber:iq:auth'/>
-<feature var='vcard-temp'/>
-<feature var='http://jabber.org/protocol/amp'/>
-<feature var='msgoffline'/>
-<feature var='http://jabber.org/protocol/disco#info'/>
-<feature var='http://jabber.org/protocol/disco#items'/>
-<feature var='urn:xmpp:blocking'/>
-<feature var='urn:xmpp:reporting:0'/>
-<feature var='urn:xmpp:reporting:abuse:0'/>
-<feature var='urn:xmpp:reporting:spam:0'/>
-<feature var='urn:xmpp:reporting:1'/>
-<feature var='urn:xmpp:ping'/>
-<feature var='urn:ietf:params:xml:ns:xmpp-sasl'/>
-<feature var='http://jabber.org/protocol/pubsub'/>
-<feature var='http://jabber.org/protocol/pubsub#owner'/>
-<feature var='http://jabber.org/protocol/pubsub#publish'/>
-<identity type='pep' category='pubsub'/>
-<feature var='urn:xmpp:pep-vcard-conversion:0'/>
-<feature var='urn:xmpp:bookmarks-conversion:0'/>
-<feature var='urn:xmpp:archive:auto'/>
-<feature var='urn:xmpp:archive:manage'/>
-<feature var='urn:xmpp:push:0'/>
-<feature var='tigase:push:away:0'/>
-<feature var='tigase:push:encrypt:0'/>
-<feature var='tigase:push:encrypt:aes-128-gcm'/>
-<feature var='tigase:push:filter:ignore-unknown:0'/>
-<feature var='tigase:push:filter:groupchat:0'/>
-<feature var='tigase:push:filter:muted:0'/>
-<feature var='tigase:push:priority:0'/>
-<feature var='tigase:push:jingle:0'/>
-<feature var='jabber:iq:roster'/>
-<feature var='jabber:iq:roster-dynamic'/>
-<feature var='urn:xmpp:mam:1'/>
-<feature var='urn:xmpp:mam:2'/>
-<feature var='urn:xmpp:mam:2#extended'/>
-<feature var='urn:xmpp:mix:pam:2#archive'/>
-<feature var='jabber:iq:version'/>
-<feature var='urn:xmpp:time'/>
-<feature var='jabber:iq:privacy'/>
-<feature var='urn:ietf:params:xml:ns:xmpp-bind'/>
-<feature var='urn:xmpp:extdisco:2'/>
-<feature var='http://jabber.org/protocol/commands'/>
-<feature var='urn:ietf:params:xml:ns:vcard-4.0'/>
-<feature var='jabber:iq:private'/>
-<feature var='urn:ietf:params:xml:ns:xmpp-session'/>
-</query>'''
-      ),
-      JID.fromString('pubsub.server.example.org'),
-    );
-
-    return Result(result);
-  }
-}
-
-T? getDiscoManagerStub<T extends XmppManagerBase>(String id) {
-  return StubbedDiscoManager() as T;
-}
-  
-void main() {
-  initLogger();
-
-  test('Test publishing with pubsub#max_items when the server does not support it', () async {
-    XMLNode? sent;
-    final manager = PubSubManager();
-    manager.register(
-      XmppManagerAttributes(
-        sendStanza: (stanza, { StanzaFromType addFrom = StanzaFromType.full, bool addId = true, bool awaitable = true, bool encrypted = false, bool forceEncryption = false, }) async {
-          sent = stanza;
-
-          return XMLNode.fromString('<iq />');
-        },
-        sendNonza: (_) {},
-        sendEvent: (_) {},
-        getManagerById: getDiscoManagerStub,
-        getConnectionSettings: () => ConnectionSettings(
-          jid: JID.fromString('hallo@example.server'),
-          password: 'password',
-          useDirectTLS: true,
-          allowPlainAuth: false,
-        ),
-        isFeatureSupported: (_) => false,
-        getFullJID: () => JID.fromString('hallo@example.server/uwu'),
-        getSocket: () => StubTCPSocket(play: []),
-        getConnection: () => XmppConnection(TestingReconnectionPolicy(), AlwaysConnectedConnectivityManager(), StubTCPSocket(play: [])),
-        getNegotiatorById: getNegotiatorNullStub,
-      ),
-    );
-
-  final result = await manager.preprocessPublishOptions(
-    'pubsub.server.example.org',
-    'example:node',
-    PubSubPublishOptions(
-      maxItems: 'max', 
-    ),
-  );
-
-  });
-}

packages/moxxmpp_socket_tcp/lib/src/socket.dart

@@ -22,8 +22,7 @@ class TCPSocketWrapper extends BaseSocketWrapper {
   final StreamController<String> _dataStream = StreamController.broadcast();
 
   /// The stream of outgoing (TCPSocketWrapper -> XmppConnection) events.
-  final StreamController<XmppSocketEvent> _eventStream =
+  final StreamController<XmppSocketEvent> _eventStream = StreamController.broadcast();
-      StreamController.broadcast();
 
   /// A subscription on the socket's data stream.
   StreamSubscription<dynamic>? _socketSubscription;
@@ -81,9 +80,7 @@ class TCPSocketWrapper extends BaseSocketWrapper {
     results.sort(srvRecordSortComparator);
     for (final srv in results) {
       try {
-        _log.finest(
+        _log.finest('Attempting secure connection to ${srv.target}:${srv.port}...');
-          'Attempting secure connection to ${srv.target}:${srv.port}...',
-        );
 
         // Workaround: We cannot set the SNI directly when using SecureSocket.connect.
         // instead, we connect using a regular socket and then secure it. This allows
@@ -292,8 +289,7 @@ class TCPSocketWrapper extends BaseSocketWrapper {
   Stream<String> getDataStream() => _dataStream.stream.asBroadcastStream();
 
   @override
-  Stream<XmppSocketEvent> getEventStream() =>
+  Stream<XmppSocketEvent> getEventStream() => _eventStream.stream.asBroadcastStream();
-      _eventStream.stream.asBroadcastStream();
 
   @override
   void write(Object? data, { String? redact }) {