Skip to content

TF-3731 Thread Detail Cache web #3840

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.

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

Open
wants to merge 3 commits into
base: feature/thread-master-0.16.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions lib/features/email/presentation/action/email_ui_action.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/email/email_action_type.dart';
import 'package:model/email/presentation_email.dart';
import 'package:tmail_ui_user/features/base/action/ui_action.dart';
Expand Down Expand Up @@ -58,4 +59,13 @@ class RefreshThreadDetailAction extends EmailUIAction {

@override
List<Object?> get props => [emailChangeResponse];
}

class CollapseEmailInThreadDetailAction extends EmailUIAction {
CollapseEmailInThreadDetailAction(this.emailId);

final EmailId emailId;

@override
List<Object?> get props => [emailId];
}
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ import 'package:tmail_ui_user/features/search/email/presentation/search_email_co
import 'package:tmail_ui_user/features/thread_detail/presentation/extension/close_thread_detail_action.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/extension/focus_thread_detail_expanded_email.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/extension/mark_collapsed_email_unread_success.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/extension/update_cached_list_email_loaded.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/thread_detail_controller.dart';
import 'package:tmail_ui_user/main/error/capability_validator.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
Expand Down Expand Up @@ -406,6 +407,12 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
worker.dispose();
}
Get.delete<SingleEmailController>(tag: _currentEmailId!.id.value);
} else if (action is CollapseEmailInThreadDetailAction) {
if (_currentEmailId == null || action.emailId != _currentEmailId) return;
for (var worker in obxListeners) {
worker.dispose();
}
Get.delete<SingleEmailController>(tag: _currentEmailId!.id.value);
Comment on lines +410 to +415
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check again memory leak for this case

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed no memory leak

}
}));

Expand All @@ -417,16 +424,6 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
}
});
}));
if (_threadDetailController != null) {
obxListeners.add(ever(
_threadDetailController!.currentExpandedEmailId,
(emailId) {
if (emailId == null || emailId != _currentEmailId) return;

_threadDetailController!.currentEmailLoaded.value = currentEmailLoaded.value;
},
));
}
}

void _handleOpenEmailDetailedView() {
Expand Down Expand Up @@ -592,6 +589,17 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
}

void _getEmailContentAction(EmailId emailId) {
if (_currentEmailId != null && _threadDetailController?.cachedEmailLoaded[_currentEmailId!] != null) {
final emailLoaded = _threadDetailController!.cachedEmailLoaded[_currentEmailId!]!;
consumeState(Stream.value(Right(GetEmailContentSuccess(
htmlEmailContent: emailLoaded.htmlContent,
emailCurrent: emailLoaded.emailCurrent,
attachments: emailLoaded.attachments,
inlineImages: emailLoaded.inlineImages,
))));
return;
}

if (session != null && accountId != null) {
try {
final baseDownloadUrl = session!.getDownloadUrl(jmapUrl: dynamicUrlInterceptors.jmapUrl);
Expand Down Expand Up @@ -712,6 +720,11 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
accountId,
detailedEmail
);
} else if (currentEmail?.id != null && currentEmailLoaded.value != null) {
_threadDetailController?.cacheEmailLoaded(
currentEmail!.id!,
currentEmailLoaded.value!,
);
}

final isShowMessageReadReceipt = success.emailCurrent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import 'package:get/get.dart';
import 'package:model/email/email_action_type.dart';
import 'package:model/email/presentation_email.dart';
import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart';
import 'package:tmail_ui_user/features/email/presentation/bindings/email_bindings.dart';
import 'package:tmail_ui_user/features/email/presentation/controller/single_email_controller.dart';
import 'package:model/email/email_in_thread_status.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/extension/focus_thread_detail_expanded_email.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/extension/thread_detail_on_email_action_click.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/thread_detail_controller.dart';

extension ToggleThreadDetailCollapeExpand on ThreadDetailController {
Expand All @@ -18,22 +14,14 @@ extension ToggleThreadDetailCollapeExpand on ThreadDetailController {
emailIdsPresentation[emailId] = presentationEmail.copyWith(
emailInThreadStatus: EmailInThreadStatus.collapsed,
);
mailboxDashBoardController.dispatchEmailUIAction(
CollapseEmailInThreadDetailAction(emailId),
);
currentExpandedEmailId.value = null;
return;
}

final isInitialized = Get.isRegistered<SingleEmailController>(
tag: emailId.id.value,
);
if (!isInitialized) {
EmailBindings(currentEmailId: presentationEmail.id).dependencies();
} else {
focusExpandedEmail(emailId);
threadDetailOnEmailActionClick(
presentationEmail,
EmailActionType.markAsRead,
);
}
EmailBindings(currentEmailId: presentationEmail.id).dependencies();
for (var key in emailIdsPresentation.keys) {
if (emailIdsPresentation[key] == null) continue;

Expand All @@ -49,6 +37,9 @@ extension ToggleThreadDetailCollapeExpand on ThreadDetailController {
emailIdsPresentation[key] = emailIdsPresentation[key]?.copyWith(
emailInThreadStatus: EmailInThreadStatus.collapsed,
);
mailboxDashBoardController.dispatchEmailUIAction(
CollapseEmailInThreadDetailAction(key),
);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:tmail_ui_user/features/email/presentation/model/email_loaded.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/thread_detail_controller.dart';

extension UpdateCachedEmailLoaded on ThreadDetailController {
void cacheEmailLoaded(EmailId emailId, EmailLoaded emailLoaded) {
const cacheLimit = 20;

if (cachedEmailLoaded[emailId] == null &&
cachedEmailLoaded.length >= cacheLimit) {
cachedEmailLoaded.remove(cachedEmailLoaded.keys.first);
}
cachedEmailLoaded[emailId] = emailLoaded;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ class ThreadDetailController extends BaseController {
IndividualHeaderIdentifier.listPostHeader.value,
IndividualHeaderIdentifier.listUnsubscribeHeader.value,
});
final cachedEmailLoaded = <EmailId, EmailLoaded>{};

final mailboxDashBoardController = Get.find<MailboxDashBoardController>();
final searchEmailController = Get.find<SearchEmailController>();
Expand Down Expand Up @@ -214,6 +215,7 @@ class ThreadDetailController extends BaseController {
scrollController = null;
currentExpandedEmailId.value = null;
currentEmailLoaded.value = null;
cachedEmailLoaded.clear();
}

@override
Expand Down
Loading