OT-757: Regression: Flagged Messages not filtered per Chat (#484)

coi-dev · Mar 26, 2020 · 4ec43f4 · 4ec43f4
1 parent ef006f9
commit 4ec43f4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/lib/src/chat/chat_profile_group.dart b/lib/src/chat/chat_profile_group.dart
@@ -171,7 +171,7 @@ class _ChatProfileGroupState extends State<ChatProfileGroup> {
       case SettingsItemName.flagged:
         _navigation.push(
           context,
-          MaterialPageRoute(builder: (context) => Flagged()),
+          MaterialPageRoute(builder: (context) => Flagged(chatId: widget.chatId)),
         );
         break;
       case SettingsItemName.notification:

diff --git a/lib/src/chat/chat_profile_single.dart b/lib/src/chat/chat_profile_single.dart
@@ -185,7 +185,7 @@ class _ChatProfileOneToOneState extends State<ChatProfileOneToOne> {
       case SettingsItemName.flagged:
         _navigation.push(
           context,
-          MaterialPageRoute(builder: (context) => Flagged()),
+          MaterialPageRoute(builder: (context) => Flagged(chatId: widget.chatId)),
         );
         break;
       case SettingsItemName.notification:

diff --git a/lib/src/contact/contact_details.dart b/lib/src/contact/contact_details.dart
@@ -142,12 +142,13 @@ class _ContactDetailsState extends State<ContactDetails> with ChatCreateMixin {
                     iconBackground: CustomTheme.of(context).chatIcon,
                     onTap: () => createChatFromContact(context, widget.contactId),
                   ),
-                  SettingsItem(
-                    icon: IconSource.flag,
-                    text: L10n.get(L.settingItemFlaggedTitle),
-                    iconBackground: CustomTheme.of(context).flagIcon,
-                    onTap: () => _settingsItemTapped(context, SettingsItemName.flagged),
-                  ),
+//TODO: This should be discussed (Flagged messages per user)!
+//                  SettingsItem(
+//                    icon: IconSource.flag,
+//                    text: L10n.get(L.settingItemFlaggedTitle),
+//                    iconBackground: CustomTheme.of(context).flagIcon,
+//                    onTap: () => _settingsItemTapped(context, SettingsItemName.flagged),
+//                  ),
                   SettingsItem(
                     key: Key(keyUserProfileBlockIconSource),
                     icon: IconSource.block,