Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TF-1912 Rendering issue on TMail when reading an email #2037

Merged
merged 2 commits into from
Jul 18, 2023
Merged

TF-1912 Rendering issue on TMail when reading an email #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
937fc43
TF-1912 Sanitize html for email content when type is text/plain
dab246 Jul 17, 2023
2cda146
TF-1912 Only trigger log when debug logs are enabled
dab246 Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions core/lib/presentation/utils/html_transformer/text/sanitize_html_transformers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

import 'dart:convert';

import 'package:core/presentation/utils/html_transformer/base/text_transformer.dart';
import 'package:core/utils/app_logger.dart';

class SanitizeHtmlTransformers extends TextTransformer {

const SanitizeHtmlTransformers();

@override
String process(String text) {
final htmlEncoded = const HtmlEscape().convert(text);
log('HtmlSanitizerTransformers::process:htmlEncoded: $htmlEncoded');
dab246 marked this conversation as resolved.
Show resolved Hide resolved
return htmlEncoded;
}
}
4 changes: 2 additions & 2 deletions core/lib/utils/app_logger.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
final logHistory = _Dispatcher("");

void log(String? value) {
String v = value ?? "";
logHistory.value = "$v\n${logHistory.value}";
if (kDebugMode) {
String v = value ?? "";
logHistory.value = "$v\n${logHistory.value}";
print(v);
}
}
Expand Down
3 changes: 1 addition & 2 deletions lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'dart:developer';

import 'package:core/presentation/extensions/color_extension.dart';
import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/utils/app_logger.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
Expand Down
10 changes: 8 additions & 2 deletions lib/features/email/data/local/html_analyzer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:core/data/network/dio_client.dart';
import 'package:core/presentation/utils/html_transformer/dom/add_tooltip_link_transformers.dart';
import 'package:core/presentation/utils/html_transformer/html_transform.dart';
import 'package:core/presentation/utils/html_transformer/text/convert_url_string_to_html_links_transformers.dart';
import 'package:core/presentation/utils/html_transformer/text/sanitize_html_transformers.dart';
import 'package:core/presentation/utils/html_transformer/transform_configuration.dart';
import 'package:model/email/email_content.dart';
import 'package:model/email/email_content_type.dart';
Expand Down Expand Up @@ -33,8 +34,13 @@ class HtmlAnalyzer {
case EmailContentType.textPlain:
final htmlTransform = HtmlTransform(emailContent.content);
final message = htmlTransform.transformToTextPlain(
transformConfiguration: TransformConfiguration.create(
customTextTransformers: [const ConvertUrlStringToHtmlLinksTransformers()]));
transformConfiguration: TransformConfiguration.create(
customTextTransformers: [
const ConvertUrlStringToHtmlLinksTransformers(),
const SanitizeHtmlTransformers(),
]
)
);
return EmailContent(emailContent.type, message);
default:
return emailContent;
Expand Down
Loading