TF-3847 Fix blank user avatar on Stalwart server
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
+24
@@ -0,0 +1,24 @@
|
||||
|
||||
import 'package:core/utils/app_logger.dart';
|
||||
import 'package:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:model/extensions/session_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
|
||||
|
||||
extension UpdateOwnEmailAddressExtension on ManageAccountDashBoardController {
|
||||
|
||||
void synchronizeOwnEmailAddress(String emailAddress) {
|
||||
log('UpdateOwnEmailAddressExtension::synchronizeOwnEmailAddress:OwnEmailAddress = ${ownEmailAddress.value}, NewEmailAddress = $emailAddress');
|
||||
if (ownEmailAddress.value.isNotEmpty || emailAddress.isEmpty) return;
|
||||
ownEmailAddress.value = emailAddress;
|
||||
}
|
||||
|
||||
void updateOwnEmailAddressFromIdentities(List<Identity> listIdentities) {
|
||||
final identityEmailAddress = listIdentities.firstOrNull?.email ?? '';
|
||||
|
||||
if (identityEmailAddress.isNotEmpty) {
|
||||
synchronizeOwnEmailAddress(identityEmailAddress);
|
||||
} else {
|
||||
synchronizeOwnEmailAddress(sessionCurrent?.getUserDisplayName() ?? '');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,7 @@ import 'package:tmail_ui_user/features/manage_account/domain/usecases/update_vac
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/action/dashboard_setting_action.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/email_rules/bindings/email_rules_bindings.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/export_trace_log_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/update_own_email_address_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/forward/bindings/forward_bindings.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/language_and_region/language_and_region_bindings.dart';
|
||||
@@ -53,6 +54,7 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
final settingsPageLevel = SettingsPageLevel.universal.obs;
|
||||
final vacationResponse = Rxn<VacationResponse>();
|
||||
final dashboardSettingAction = Rxn<UIAction>();
|
||||
final ownEmailAddress = Rx<String>('');
|
||||
|
||||
Session? sessionCurrent;
|
||||
bool? isVacationDateDialogDisplayed;
|
||||
@@ -103,6 +105,7 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
log('ManageAccountDashBoardController::handleReloaded:');
|
||||
sessionCurrent = session;
|
||||
accountId.value = session.accountId;
|
||||
synchronizeOwnEmailAddress(session.getOwnEmailAddressOrEmpty());
|
||||
_bindingInteractorForMenuItemView(sessionCurrent, accountId.value);
|
||||
_getVacationResponse();
|
||||
_getParametersRouter();
|
||||
@@ -112,7 +115,8 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
final arguments = Get.arguments;
|
||||
if (arguments is ManageAccountArguments) {
|
||||
sessionCurrent = arguments.session;
|
||||
accountId.value = arguments.session?.personalAccount.accountId;
|
||||
accountId.value = arguments.session?.accountId;
|
||||
synchronizeOwnEmailAddress(arguments.session?.getOwnEmailAddressOrEmpty() ?? '');
|
||||
previousUri = arguments.previousUri;
|
||||
_bindingInteractorForMenuItemView(sessionCurrent, accountId.value);
|
||||
_getVacationResponse();
|
||||
@@ -399,9 +403,6 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
accountId: accountId.value!);
|
||||
}
|
||||
|
||||
String getOwnEmailAddress() =>
|
||||
sessionCurrent?.getOwnEmailAddressOrEmpty() ?? '';
|
||||
|
||||
@override
|
||||
void onClose() {
|
||||
BackButtonInterceptor.removeByName(AppRoutes.settings);
|
||||
|
||||
@@ -47,7 +47,7 @@ class ManageAccountDashBoardView extends GetWidget<ManageAccountDashBoardControl
|
||||
return Obx(() => NavigationBarWidget(
|
||||
imagePaths: controller.imagePaths,
|
||||
accountId: controller.accountId.value,
|
||||
ownEmailAddress: controller.getOwnEmailAddress(),
|
||||
ownEmailAddress: controller.ownEmailAddress.value,
|
||||
onTapApplicationLogoAction: () =>
|
||||
controller.backToMailboxDashBoard(context: context),
|
||||
settingActionTypes: const [ProfileSettingActionType.signOut],
|
||||
|
||||
+10
-5
@@ -20,11 +20,16 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
|
||||
key: const Key('setting_menu'),
|
||||
child: Column(children: [
|
||||
Obx(() => UserInformationWidget(
|
||||
userName: controller.manageAccountDashboardController.accountId.value != null
|
||||
? controller.manageAccountDashboardController.getOwnEmailAddress()
|
||||
: '',
|
||||
padding: SettingsUtils.getPaddingInFirstLevel(context, controller.responsiveUtils),
|
||||
titlePadding: const EdgeInsetsDirectional.only(start: 16))),
|
||||
ownEmailAddress: controller
|
||||
.manageAccountDashboardController
|
||||
.ownEmailAddress
|
||||
.value,
|
||||
padding: SettingsUtils.getPaddingInFirstLevel(
|
||||
context,
|
||||
controller.responsiveUtils,
|
||||
),
|
||||
titlePadding: const EdgeInsetsDirectional.only(start: 16),
|
||||
)),
|
||||
Divider(
|
||||
color: AppColor.colorDividerHorizontal,
|
||||
height: 1,
|
||||
|
||||
+12
-2
@@ -13,6 +13,7 @@ import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:model/extensions/identity_request_dto_extension.dart';
|
||||
import 'package:model/extensions/session_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/before_reconnect_handler.dart';
|
||||
import 'package:tmail_ui_user/features/base/before_reconnect_manager.dart';
|
||||
import 'package:tmail_ui_user/features/base/reloadable/reloadable_controller.dart';
|
||||
@@ -39,6 +40,7 @@ import 'package:tmail_ui_user/features/manage_account/domain/usecases/edit_ident
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_identities_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/usecases/transform_html_signature_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/identity_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/update_own_email_address_extension.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/model/identity_action_type.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/profiles/identities/widgets/delete_identity_dialog_builder.dart';
|
||||
@@ -128,6 +130,10 @@ class IdentitiesController extends ReloadableController implements BeforeReconne
|
||||
_deleteIdentityAction(failure.identityId);
|
||||
} else if (failure is GetIdentityCacheOnWebFailure) {
|
||||
_removeIdentityCache();
|
||||
} else if (failure is GetAllIdentitiesFailure) {
|
||||
accountDashBoardController.synchronizeOwnEmailAddress(
|
||||
accountDashBoardController.sessionCurrent?.getUserDisplayName() ?? '',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -158,13 +164,17 @@ class IdentitiesController extends ReloadableController implements BeforeReconne
|
||||
}
|
||||
|
||||
void _handleGetAllIdentitiesSuccess(GetAllIdentitiesSuccess success) {
|
||||
if (success.identities?.isNotEmpty == true) {
|
||||
final newListIdentities = success.identities!
|
||||
final listIdentities = success.identities ?? [];
|
||||
|
||||
if (listIdentities.isNotEmpty) {
|
||||
final newListIdentities = listIdentities
|
||||
.where((identity) => identity.mayDelete == true && identity.name?.trim().isNotEmpty == true)
|
||||
.toList();
|
||||
listAllIdentities.addAll(newListIdentities);
|
||||
}
|
||||
|
||||
accountDashBoardController.updateOwnEmailAddressFromIdentities(listIdentities);
|
||||
|
||||
if (listAllIdentities.isNotEmpty) {
|
||||
selectIdentity(listAllIdentities.first);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user