fix: Just use shouldEncryptElement for the envelope "validation"

This commit is contained in:
PapaTutuWawa 2023-01-23 13:11:07 +01:00
parent 72099dfde5
commit 1cc266c675

View File

@ -462,18 +462,8 @@ abstract class BaseOmemoManager extends XmppManagerBase {
final envelopeChildren = envelope.firstTag('content')?.children;
if (envelopeChildren != null) {
children.addAll(
envelopeChildren
// Do not add forbidden elements from the envelope
.where((XMLNode child) {
for (final ignore in _doNotEncryptList) {
final xmlns = child.attributes['xmlns'] ?? '';
if (child.tag == ignore.tag && xmlns == ignore.xmlns) {
return false;
}
}
return true;
}),
// Do not add forbidden elements from the envelope
envelopeChildren.where(shouldEncryptElement),
);
} else {
logger.warning('Invalid envelope element: No <content /> element');