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

@@ -13,10 +13,11 @@ import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
 import 'package:moxxmpp/src/xeps/xep_0297.dart';
 
 class CarbonsManager extends XmppManagerBase {
-  CarbonsManager() : super();
+
-  bool _isEnabled = false;
+  CarbonsManager() : _isEnabled = false, _supported = false, _gotSupported = false, super();
-  bool _supported = false;
+  bool _isEnabled;
-  bool _gotSupported = false;
+  bool _supported;
+  bool _gotSupported;
   
   @override
   String getId() => carbonsManager;
@@ -158,9 +159,6 @@ class CarbonsManager extends XmppManagerBase {
     return true;
   }
 
-  /// True if Message Carbons are enabled. False, if not.
-  bool get isEnabled => _isEnabled;
-  
   @visibleForTesting
   void forceEnable() {
     _isEnabled = true;

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

@@ -16,7 +16,6 @@ import 'package:moxxmpp/src/xeps/xep_0030/types.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
 import 'package:moxxmpp/src/xeps/xep_0060/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0060/xep_0060.dart';
-import 'package:moxxmpp/src/xeps/xep_0280.dart';
 import 'package:moxxmpp/src/xeps/xep_0334.dart';
 import 'package:moxxmpp/src/xeps/xep_0380.dart';
 import 'package:moxxmpp/src/xeps/xep_0384/crypto.dart';
@@ -338,31 +337,15 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     }
     
     logger.finest('Beginning encryption');
-    final carbonsEnabled = getAttributes()
-      .getManagerById<CarbonsManager>(carbonsManager)?.isEnabled ?? false;
     final om = await getOmemoManager();
     final result = await om.onOutgoingStanza(
       OmemoOutgoingStanza(
-        [
+        [toJid.toString()],
-          toJid.toString(),
-          if (carbonsEnabled)
-            getAttributes().getFullJID().toBare().toString(),
-        ],
         _buildEnvelope(toEncrypt, toJid.toString()),
       ),
     );
     logger.finest('Encryption done');
 
-    if (!result.isSuccess(2)) {
-      final other = Map<String, dynamic>.from(state.other);
-      other['encryption_error_jids'] = result.jidEncryptionErrors;
-      other['encryption_error_devices'] = result.deviceEncryptionErrors;
-      return state.copyWith(
-        other: other,
-        cancel: true,
-      );
-    }
-    
     final encrypted = _buildEncryptedElement(
       result,
       toJid.toString(),

packages/moxxmpp/pubspec.yaml

@@ -20,7 +20,7 @@ dependencies:
    version: ^0.1.5
   omemo_dart:
     hosted: https://git.polynom.me/api/packages/PapaTutuWawa/pub
-    version: ^0.4.1
+    version: ^0.4.0
   random_string: ^2.3.1
   saslprep: ^1.0.2
   synchronized: ^3.0.0+2