TF-2532 Only clear old data stream when add object to stream in share file
Signed-off-by: dab246 <tdvu@linagora.com> (cherry picked from commit 181e1ec20dafe4f865d0f2ce606311cf216e06fd)
This commit is contained in:
-3
@@ -416,7 +416,6 @@ class MailboxDashBoardController extends ReloadableController {
|
|||||||
_emailAddressStreamSubscription =
|
_emailAddressStreamSubscription =
|
||||||
_emailReceiveManager.pendingEmailAddressInfo.stream.listen((emailAddress) {
|
_emailReceiveManager.pendingEmailAddressInfo.stream.listen((emailAddress) {
|
||||||
if (emailAddress?.email?.isNotEmpty == true) {
|
if (emailAddress?.email?.isNotEmpty == true) {
|
||||||
_emailReceiveManager.clearPendingEmailAddress();
|
|
||||||
goToComposer(ComposerArguments.fromEmailAddress(emailAddress!));
|
goToComposer(ComposerArguments.fromEmailAddress(emailAddress!));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -426,7 +425,6 @@ class MailboxDashBoardController extends ReloadableController {
|
|||||||
_emailContentStreamSubscription =
|
_emailContentStreamSubscription =
|
||||||
_emailReceiveManager.pendingEmailContentInfo.stream.listen((emailContent) {
|
_emailReceiveManager.pendingEmailContentInfo.stream.listen((emailContent) {
|
||||||
if (emailContent?.content.isNotEmpty == true) {
|
if (emailContent?.content.isNotEmpty == true) {
|
||||||
_emailReceiveManager.clearPendingEmailContent();
|
|
||||||
goToComposer(ComposerArguments.fromContentShared([emailContent!].asHtmlString));
|
goToComposer(ComposerArguments.fromContentShared([emailContent!].asHtmlString));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -436,7 +434,6 @@ class MailboxDashBoardController extends ReloadableController {
|
|||||||
_fileReceiveManagerStreamSubscription =
|
_fileReceiveManagerStreamSubscription =
|
||||||
_emailReceiveManager.pendingFileInfo.stream.listen((listFile) {
|
_emailReceiveManager.pendingFileInfo.stream.listen((listFile) {
|
||||||
if (listFile.isNotEmpty) {
|
if (listFile.isNotEmpty) {
|
||||||
_emailReceiveManager.clearPendingFileInfo();
|
|
||||||
goToComposer(ComposerArguments.fromFileShared(listFile));
|
goToComposer(ComposerArguments.fromFileShared(listFile));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -29,16 +29,16 @@ class EmailReceiveManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void setPendingEmailAddress(EmailAddress emailAddress) async {
|
void setPendingEmailAddress(EmailAddress emailAddress) async {
|
||||||
clearPendingEmailAddress();
|
_clearPendingEmailAddress();
|
||||||
_pendingEmailAddressInfo.add(emailAddress);
|
_pendingEmailAddressInfo.add(emailAddress);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setPendingEmailContent(EmailContent emailContent) async {
|
void setPendingEmailContent(EmailContent emailContent) async {
|
||||||
clearPendingEmailAddress();
|
_clearPendingEmailContent();
|
||||||
_pendingEmailContentInfo.add(emailContent);
|
_pendingEmailContentInfo.add(emailContent);
|
||||||
}
|
}
|
||||||
|
|
||||||
void clearPendingEmailContent() {
|
void _clearPendingEmailContent() {
|
||||||
if (_pendingEmailContentInfo.isClosed) {
|
if (_pendingEmailContentInfo.isClosed) {
|
||||||
_pendingEmailContentInfo = BehaviorSubject.seeded(null);
|
_pendingEmailContentInfo = BehaviorSubject.seeded(null);
|
||||||
} else {
|
} else {
|
||||||
@@ -46,7 +46,7 @@ class EmailReceiveManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void clearPendingEmailAddress() {
|
void _clearPendingEmailAddress() {
|
||||||
if(_pendingEmailAddressInfo.isClosed) {
|
if(_pendingEmailAddressInfo.isClosed) {
|
||||||
_pendingEmailAddressInfo = BehaviorSubject.seeded(null);
|
_pendingEmailAddressInfo = BehaviorSubject.seeded(null);
|
||||||
} else {
|
} else {
|
||||||
@@ -56,22 +56,20 @@ class EmailReceiveManager {
|
|||||||
|
|
||||||
void closeEmailReceiveManagerStream() {
|
void closeEmailReceiveManagerStream() {
|
||||||
_pendingEmailAddressInfo.close();
|
_pendingEmailAddressInfo.close();
|
||||||
|
_pendingEmailContentInfo.close();
|
||||||
|
_pendingFileInfo.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
void setPendingFileInfo(List<SharedMediaFile> list) async {
|
void setPendingFileInfo(List<SharedMediaFile> list) async {
|
||||||
clearPendingFileInfo();
|
_clearPendingFileInfo();
|
||||||
_pendingFileInfo.add(list);
|
_pendingFileInfo.add(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
void clearPendingFileInfo() {
|
void _clearPendingFileInfo() {
|
||||||
if(_pendingFileInfo.isClosed) {
|
if(_pendingFileInfo.isClosed) {
|
||||||
_pendingFileInfo = BehaviorSubject.seeded(List.empty(growable: true));
|
_pendingFileInfo = BehaviorSubject.seeded(List.empty(growable: true));
|
||||||
} else {
|
} else {
|
||||||
_pendingFileInfo.add(List.empty(growable: true));
|
_pendingFileInfo.add(List.empty(growable: true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void closeFileSharingStream() {
|
|
||||||
_pendingFileInfo.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user