Skip to content
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

TW-218: Fix double click on forward msg #319

Merged
merged 4 commits into from
Jul 20, 2023
Merged
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
67 changes: 41 additions & 26 deletions lib/config/routes.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:fluffychat/di/chat/chat_di.dart';
import 'package:fluffychat/di/contact/contact_di.dart';
import 'package:fluffychat/di/create_direct_chat/create_direct_chat_di.dart';
import 'package:fluffychat/di/forward/forward_di.dart';
import 'package:fluffychat/pages/add_story/add_story.dart';
import 'package:fluffychat/pages/archive/archive.dart';
import 'package:fluffychat/pages/chat/chat.dart';
Expand All @@ -13,6 +14,7 @@ import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_sett
import 'package:fluffychat/pages/connect/connect_page.dart';
import 'package:fluffychat/pages/contacts_tab/contacts_tab.dart';
import 'package:fluffychat/pages/device_settings/device_settings.dart';
import 'package:fluffychat/pages/forward/forward.dart';
import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart';
import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart';
import 'package:fluffychat/pages/login/login.dart';
Expand All @@ -36,6 +38,7 @@ import 'package:fluffychat/widgets/layouts/side_view_layout.dart';
import 'package:fluffychat/widgets/layouts/two_column_layout.dart';
import 'package:fluffychat/widgets/log_view.dart';
import 'package:fluffychat/widgets/vwidget_with_dependencies.dart';
import 'package:fluffychat/widgets/vwidget_with_dependency.dart';
import 'package:flutter/material.dart';
import 'package:vrouter/vrouter.dart';

Expand Down Expand Up @@ -141,6 +144,12 @@ class AppRoutes {
stackedRoutes: _chatDetailsRoutes,
buildTransition: rightToLeftTransition,
),
VWidgetWithDependency(
path: 'forward',
widget: const Forward(),
di: ForwardDI(),
buildTransition: rightToLeftTransition,
)
],
),
VWidget(
Expand Down Expand Up @@ -356,32 +365,38 @@ class AppRoutes {
];

List<VRouteElement> get _chatDetailsRoutes => [
VWidget(
path: 'permissions',
widget: const ChatPermissionsSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'invite',
widget: const InvitationSelection(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'multiple_emotes',
widget: const MultipleEmotesSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'emotes',
widget: const EmotesSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'emotes/:state_key',
widget: const EmotesSettings(),
buildTransition: _dynamicTransition,
),
];
VWidget(
path: 'permissions',
widget: const ChatPermissionsSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'invite',
widget: const InvitationSelection(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'multiple_emotes',
widget: const MultipleEmotesSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'emotes',
widget: const EmotesSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'emotes/:state_key',
widget: const EmotesSettings(),
buildTransition: _dynamicTransition,
),
VWidgetWithDependency(
path: 'forward',
widget: const Forward(),
di: ForwardDI(),
buildTransition: _leftToRightTransition,
)
];

List<VRouteElement> get _settingsRoutes => [
VWidget(
Expand Down
18 changes: 18 additions & 0 deletions lib/di/forward/forward_di.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import 'package:fluffychat/di/base_di.dart';
import 'package:fluffychat/domain/usecase/forward/forward_message_interactor.dart';
import 'package:get_it/get_it.dart';
import 'package:matrix/matrix.dart';

class ForwardDI extends BaseDI {
@override
String get scopeName => 'Create Forward';

@override
void setUp(GetIt get) {
Logs().d('ForwardDI::setUp()');

get.registerSingleton<ForwardMessageInteractor>(ForwardMessageInteractor());

Logs().d('ForwardDI::setUp() - done');
}
}
38 changes: 38 additions & 0 deletions lib/domain/app_state/forward/forward_message_state.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import 'package:fluffychat/app_state/failure.dart';
import 'package:fluffychat/app_state/success.dart';
import 'package:matrix/matrix.dart';

class ForwardMessageLoading extends Success {
@override
List<Object?> get props => [];
}

class ForwardMessageSuccess extends Success {
final Room room;

const ForwardMessageSuccess(this.room);
@override
List<Object?> get props => [room];
}

class ForwardMessageFailed extends Failure {
final dynamic exception;

const ForwardMessageFailed({required this.exception});

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

class ForwardMessageIsShareFileState extends Success {
final MatrixFile shareFile;
final Room room;

const ForwardMessageIsShareFileState({
required this.shareFile,
required this.room
});

@override
List<Object?> get props => [shareFile, room];
}
77 changes: 77 additions & 0 deletions lib/domain/usecase/forward/forward_message_interactor.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import 'package:dartz/dartz.dart';
import 'package:fluffychat/app_state/failure.dart';
import 'package:fluffychat/app_state/success.dart';
import 'package:fluffychat/domain/app_state/forward/forward_message_state.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:matrix/matrix.dart';

class ForwardMessageInteractor {
Stream<Either<Failure, Success>> execute({
required List<Room> rooms,
required List<String> selectedEvents,
required MatrixState matrixState,
}) async* {
try {
yield Right(ForwardMessageLoading());

final room = rooms.firstWhere((element) => element.id == selectedEvents.first);
if (room.membership == Membership.join) {
if (matrixState.shareContentList.isEmpty && matrixState.shareContent != null) {
yield* _forwardOneMessageAction(room: room, matrixState: matrixState);
} else {
yield* _forwardMultipleMessagesAction(room: room, matrixState: matrixState);
}
}
} catch (exception) {
yield Left(ForwardMessageFailed(exception: exception));
}
}

Stream<Either<Failure, Success>> _forwardMessage(Map<String, dynamic> message, Room room) async* {
final shareFile = message.tryGet<MatrixFile>('file');
if (message.tryGet<String>('msgtype') == 'chat.fluffy.shared_file' && shareFile != null) {
yield Right(ForwardMessageIsShareFileState(shareFile: shareFile, room: room));
}
await room.sendEvent(message);
}

Stream<Either<Failure, Success>> _forwardOneMessageAction({
required Room room,
required MatrixState matrixState,
}) async* {
try {
final message = matrixState.shareContent;
if (message != null) {
yield* _forwardMessage(message, room);
message.clear();
}
yield Right(ForwardMessageSuccess(room));
} catch (exception) {
yield Left(ForwardMessageFailed(exception: exception));
}
}

Stream<Either<Failure, Success>> _forwardMultipleMessagesAction({
required Room room,
required MatrixState matrixState,
}) async* {
try {
yield Right(ForwardMessageLoading());

final messages = matrixState.shareContentList;
if (messages.isNotEmpty) {
for (final message in messages) {
if (message != null) {
yield* _forwardMessage(message, room);
} else {
continue;
}
}
messages.clear();
}
yield Right(ForwardMessageSuccess(room));
} catch (exception) {
yield Left(ForwardMessageFailed(exception: exception));
}
}
}
10 changes: 4 additions & 6 deletions lib/pages/chat/chat.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import 'package:fluffychat/domain/model/download_file/download_file_for_preview_
import 'package:fluffychat/domain/model/preview_file/document_uti.dart';
import 'package:fluffychat/domain/model/preview_file/supported_preview_file_types.dart';
import 'package:fluffychat/domain/usecase/download_file_for_preview_interactor.dart';
import 'package:fluffychat/domain/usecase/send_image_interactor.dart';
import 'package:fluffychat/domain/usecase/send_images_interactor.dart';
import 'package:fluffychat/pages/chat/chat_actions.dart';
import 'package:fluffychat/pages/forward/forward.dart';
import 'package:fluffychat/presentation/mixin/image_picker_mixin.dart';
import 'package:fluffychat/presentation/mixin/send_files_mixin.dart';
Expand Down Expand Up @@ -743,12 +746,7 @@ class ChatController extends State<Chat> with ImagePickerMixin, SendFilesMixin {
Logs().d("forwardEventsAction():: shareContentList: ${Matrix.of(context).shareContentList}");
}
setState(() => selectedEvents.clear());
await showDialog(
context: context,
useSafeArea: false,
useRootNavigator: false,
builder: (c) => const Forward(),
);
VRouter.of(context).toSegments(['rooms', room!.id, 'forward']);
}

void sendAgainAction() {
Expand Down
Loading
Loading