diff --git a/lib/config/socialNetwork.dart b/lib/config/socialNetwork.dart new file mode 100644 index 0000000000..85be4a1d6b --- /dev/null +++ b/lib/config/socialNetwork.dart @@ -0,0 +1,5 @@ +class SocialMediaIdentifiers { + static const String facebook = '@facebook'; + static const String instagram = '@instagram'; + static const String whatsapp = '@whatsapp'; +} diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 24cff7e4e6..a40cd9d0d4 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -35,9 +35,6 @@ import 'package:tawkie/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:tawkie/utils/platform_infos.dart'; import 'package:tawkie/widgets/app_lock.dart'; import 'package:tawkie/widgets/matrix.dart'; -import 'package:tawkie/utils/account_bundles.dart'; -import 'package:tawkie/utils/localized_exception_extension.dart'; -import 'package:tawkie/utils/matrix_sdk_extensions/matrix_file_extension.dart'; import 'send_file_dialog.dart'; import 'send_location_dialog.dart'; import 'sticker_picker_dialog.dart'; diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 504a3e14b5..6c33c8ed3c 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -13,6 +13,7 @@ import 'package:tawkie/widgets/avatar.dart'; import 'package:tawkie/widgets/matrix.dart'; import 'package:vibration/vibration.dart'; +import '../../../config/socialNetwork.dart'; import 'message_content.dart'; import 'reply_content.dart'; import 'state_message.dart'; @@ -85,9 +86,9 @@ class Message extends StatelessWidget { // Social network verification logic for specific events return events.any((event) { final String participantId = event.senderId.toLowerCase(); - return participantId.contains('@instagram') || - participantId.contains('@whatsapp') || - participantId.contains('@facebook'); + return participantId.contains(SocialMediaIdentifiers.instagram) || + participantId.contains(SocialMediaIdentifiers.whatsapp) || + participantId.contains(SocialMediaIdentifiers.facebook); }); } diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 1191a343be..1a101e0bf1 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -14,6 +14,8 @@ import 'package:tawkie/widgets/avatar.dart'; import 'package:tawkie/widgets/hover_builder.dart'; import 'package:tawkie/widgets/matrix.dart'; +import '../../config/socialNetwork.dart'; + enum ArchivedRoomAction { delete, rejoin } class ChatListItem extends StatelessWidget { @@ -196,15 +198,18 @@ class ChatListItem extends StatelessWidget { ); bool containsFacebook(List participantsIds) { - return participantsIds.any((id) => id.contains('@facebook')); + return participantsIds + .any((id) => id.contains(SocialMediaIdentifiers.facebook)); } bool containsInstagram(List participantsIds) { - return participantsIds.any((id) => id.contains('@instagram_')); + return participantsIds + .any((id) => id.contains(SocialMediaIdentifiers.instagram)); } bool containsWhatsApp(List participantsIds) { - return participantsIds.any((id) => id.contains('@whatsapp')); + return participantsIds + .any((id) => id.contains(SocialMediaIdentifiers.whatsapp)); } void removeFacebookTag() {