Skip to content

Commit 71903d2

Browse files
tddang-linagorahoangdat
authored andcommitted
TF-3316 Fix inconsistent vacation message
1 parent a3aee57 commit 71903d2

File tree

11 files changed

+9
-17
lines changed

11 files changed

+9
-17
lines changed

contact/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ packages:
660660
description:
661661
path: "."
662662
ref: main
663-
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
663+
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
664664
url: "https://github.com/linagora/jmap-dart-client.git"
665665
source: git
666666
version: "0.3.2"

email_recovery/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ packages:
296296
description:
297297
path: "."
298298
ref: main
299-
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
299+
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
300300
url: "https://github.com/linagora/jmap-dart-client.git"
301301
source: git
302302
version: "0.3.2"

fcm/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ packages:
296296
description:
297297
path: "."
298298
ref: main
299-
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
299+
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
300300
url: "https://github.com/linagora/jmap-dart-client.git"
301301
source: git
302302
version: "0.3.2"

forward/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ packages:
296296
description:
297297
path: "."
298298
ref: main
299-
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
299+
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
300300
url: "https://github.com/linagora/jmap-dart-client.git"
301301
source: git
302302
version: "0.3.2"

lib/features/manage_account/presentation/extensions/vacation_response_extension.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ extension VacationResponseExtension on VacationResponse {
2222
endTime: toDate?.value != null
2323
? TimeOfDay.fromDateTime(toDate!.value.toLocal())
2424
: null,
25-
messagePlainText: textBody,
2625
messageHtmlText: htmlBody,
2726
subject: subject,
2827
vacationStopEnabled: toDate != null
@@ -78,15 +77,13 @@ extension VacationResponseExtension on VacationResponse {
7877
UTCDate? fromDate,
7978
UTCDate? toDate,
8079
String? subject,
81-
String? textBody,
8280
String? htmlBody
8381
}) {
8482
return VacationResponse(
8583
isEnabled: isEnabled ?? this.isEnabled,
8684
fromDate: fromDate ?? this.fromDate,
8785
toDate: toDate ?? this.toDate,
8886
subject: subject ?? this.subject,
89-
textBody: textBody ?? this.textBody,
9087
htmlBody: htmlBody ?? this.htmlBody
9188
);
9289
}

lib/features/manage_account/presentation/model/vacation/vacation_presentation.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
1414
final TimeOfDay? startTime;
1515
final DateTime? endDate;
1616
final TimeOfDay? endTime;
17-
final String? messagePlainText;
1817
final String? messageHtmlText;
1918
final String? subject;
2019
final bool vacationStopEnabled;
@@ -25,7 +24,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
2524
this.startTime,
2625
this.endDate,
2726
this.endTime,
28-
this.messagePlainText,
2927
this.messageHtmlText,
3028
this.subject,
3129
this.vacationStopEnabled = false,
@@ -52,7 +50,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
5250
startTime: getOptionParam(startTimeOption, startTime),
5351
endDate: getOptionParam(endDateOption, endDate),
5452
endTime: getOptionParam(endTimeOption, endTime),
55-
messagePlainText: getOptionParam(messagePlainTextOption, messagePlainText),
5653
messageHtmlText: getOptionParam(messageHtmlTextOption, messageHtmlText),
5754
subject: getOptionParam(subjectOption, subject),
5855
vacationStopEnabled: vacationStopEnabled ?? this.vacationStopEnabled
@@ -81,7 +78,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
8178
endDate,
8279
endTime,
8380
vacationStopEnabled,
84-
messagePlainText,
8581
messageHtmlText,
8682
subject,
8783
];
@@ -93,7 +89,6 @@ extension VacationPresentationExtension on VacationPresentation {
9389
isEnabled: isEnabled,
9490
fromDate: fromDate != null ? UTCDate(fromDate!.toUtc()) : null,
9591
toDate: toDate != null ? UTCDate(toDate!.toUtc()) : null,
96-
textBody: messagePlainText,
9792
htmlBody: messageHtmlText,
9893
subject: subject,
9994
);

lib/features/manage_account/presentation/vacation/vacation_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class VacationController extends BaseController {
9090
void _initializeValueForVacation(VacationPresentation newVacation) {
9191
vacationPresentation.value = newVacation;
9292
subjectTextController.text = newVacation.subject ?? '';
93-
updateMessageHtmlText(newVacation.messageHtmlText ?? newVacation.messagePlainText ?? '');
93+
updateMessageHtmlText(newVacation.messageHtmlText ?? '');
9494
if (PlatformInfo.isWeb) {
9595
_richTextControllerForWeb.editorController.setText(newVacation.messageHtmlText ?? '');
9696
} else {

model/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ packages:
652652
description:
653653
path: "."
654654
ref: main
655-
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
655+
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
656656
url: "https://github.com/linagora/jmap-dart-client.git"
657657
source: git
658658
version: "0.3.2"

pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1332,7 +1332,7 @@ packages:
13321332
description:
13331333
path: "."
13341334
ref: main
1335-
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
1335+
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
13361336
url: "https://github.com/linagora/jmap-dart-client.git"
13371337
source: git
13381338
version: "0.3.2"

rule_filter/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ packages:
296296
description:
297297
path: "."
298298
ref: main
299-
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
299+
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
300300
url: "https://github.com/linagora/jmap-dart-client.git"
301301
source: git
302302
version: "0.3.2"

0 commit comments

Comments
 (0)