TF-2302 Resolve conflicts on the master branch

Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit 6eb9f32ee0f67d9b78be13a4ecd4b1ae2b4de9a0)
This commit is contained in:
dab246
2023-11-09 16:49:20 +07:00
committed by Dat Vu
parent 3d5677f6e0
commit dbdffff355
9 changed files with 87 additions and 101 deletions
@@ -198,10 +198,17 @@ class AdvancedFilterController extends BaseController {
_getDeviceContactSuggestionsInteractor = getBinding<GetDeviceContactSuggestionsInteractor>();
if (_contactSuggestionSource == ContactSuggestionSource.all) {
if (_getAllAutoCompleteInteractor == null && _getDeviceContactSuggestionsInteractor == null) {
return <EmailAddress>[];
if (_getAllAutoCompleteInteractor != null) {
return await _getAllAutoCompleteInteractor!
.execute(AutoCompletePattern(word: word, accountId: _mailboxDashBoardController.accountId.value))
.then((value) => value.fold(
(failure) => <EmailAddress>[],
(success) => success is GetAutoCompleteSuccess
? success.listEmailAddress
: <EmailAddress>[]
));
} else if (_getDeviceContactSuggestionsInteractor != null) {
final listEmailAddress = await _getDeviceContactSuggestionsInteractor!
return await _getDeviceContactSuggestionsInteractor!
.execute(AutoCompletePattern(word: word, accountId: _mailboxDashBoardController.accountId.value))
.then((value) => value.fold(
(failure) => <EmailAddress>[],
@@ -209,30 +216,22 @@ class AdvancedFilterController extends BaseController {
? success.listEmailAddress
: <EmailAddress>[]
));
return listEmailAddress;
} else {
return <EmailAddress>[];
}
final listEmailAddress = await _getAllAutoCompleteInteractor!
.execute(AutoCompletePattern(word: word, accountId: _mailboxDashBoardController.accountId.value))
.then((value) => value.fold(
(failure) => <EmailAddress>[],
(success) => success is GetAutoCompleteSuccess
? success.listEmailAddress
: <EmailAddress>[]));
return listEmailAddress;
} else {
if (_getAutoCompleteInteractor == null) {
return <EmailAddress>[];
}
final listEmailAddress = await _getAutoCompleteInteractor!
} else {
return await _getAutoCompleteInteractor!
.execute(AutoCompletePattern(word: word, accountId: _mailboxDashBoardController.accountId.value))
.then((value) => value.fold(
(failure) => <EmailAddress>[],
(success) => success is GetAutoCompleteSuccess
? success.listEmailAddress
: <EmailAddress>[]));
return listEmailAddress;
(failure) => <EmailAddress>[],
(success) => success is GetAutoCompleteSuccess
? success.listEmailAddress
: <EmailAddress>[]
));
}
}
}