[mob][photos] Properly reset last viewed clusterID

This commit is contained in:
laurenspriem
2024-05-29 16:10:03 +05:30
parent ee3ea77831
commit 85ce2d7e49

View File

@@ -57,8 +57,7 @@ class _ClusterPageState extends State<ClusterPage> {
late final StreamSubscription<LocalPhotosUpdatedEvent> _filesUpdatedEvent;
late final StreamSubscription<PeopleChangedEvent> _peopleChangedEvent;
bool get showNamingBanner =>
(!userDismissedNamingBanner && widget.showNamingBanner);
bool get showNamingBanner => (!userDismissedNamingBanner && widget.showNamingBanner);
bool userDismissedNamingBanner = false;
@@ -67,8 +66,7 @@ class _ClusterPageState extends State<ClusterPage> {
super.initState();
ClusterFeedbackService.setLastViewedClusterID(widget.clusterID);
files = widget.searchResult;
_filesUpdatedEvent =
Bus.instance.on<LocalPhotosUpdatedEvent>().listen((event) {
_filesUpdatedEvent = Bus.instance.on<LocalPhotosUpdatedEvent>().listen((event) {
if (event.type == EventType.deletedFromDevice ||
event.type == EventType.deletedFromEverywhere ||
event.type == EventType.deletedFromRemote ||
@@ -100,6 +98,9 @@ class _ClusterPageState extends State<ClusterPage> {
void dispose() {
_filesUpdatedEvent.cancel();
_peopleChangedEvent.cancel();
if (ClusterFeedbackService.lastViewedClusterID == widget.clusterID) {
ClusterFeedbackService.resetLastViewedClusterID();
}
super.dispose();
}
@@ -110,8 +111,7 @@ class _ClusterPageState extends State<ClusterPage> {
final result = files
.where(
(file) =>
file.creationTime! >= creationStartTime &&
file.creationTime! <= creationEndTime,
file.creationTime! >= creationStartTime && file.creationTime! <= creationEndTime,
)
.toList();
return Future.value(
@@ -185,8 +185,7 @@ class _ClusterPageState extends State<ClusterPage> {
context,
clusterID: widget.clusterID,
);
if (result != null &&
result is (PersonEntity, EnteFile)) {
if (result != null && result is (PersonEntity, EnteFile)) {
Navigator.pop(context);
// ignore: unawaited_futures
routeToPage(context, PeoplePage(person: result.$1));