Skip to content
This repository has been archived by the owner on Oct 19, 2022. It is now read-only.

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

Merged
merged 2 commits into from
Mar 26, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbabd70
Fixes missing chat ID for flagged messages
Mar 25, 2020
ecf4fee
Comments unused code out
Mar 25, 2020
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
2 changes: 1 addition & 1 deletion lib/src/chat/chat_profile_group.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/src/chat/chat_profile_single.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 7 additions & 6 deletions lib/src/contact/contact_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
// ),
florianhaar marked this conversation as resolved.
Show resolved Hide resolved
SettingsItem(
key: Key(keyUserProfileBlockIconSource),
icon: IconSource.block,
Expand Down