2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update SDK

Browse source
This commit is contained in:
Christian Pauly 2020-02-21 09:45:37 +01:00
commit 8c17a29c09
5 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/components/list_items/message.dart
View file

@ -29,7 +29,8 @@ class Message extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (![EventTypes.Message, EventTypes.Sticker].contains(event.type)) {
if (![EventTypes.Message, EventTypes.Sticker, EventTypes.Encrypted]
.contains(event.type)) {
return StateMessage(event);
}

9
lib/components/message_content.dart
View file

@ -23,6 +23,7 @@ class MessageContent extends StatelessWidget {
Widget build(BuildContext context) {
switch (event.type) {
case EventTypes.Message:
case EventTypes.Encrypted:
case EventTypes.Sticker:
switch (event.messageType) {
case MessageTypes.Image:
@ -134,6 +135,7 @@ class MessageContent extends StatelessWidget {
case MessageTypes.None:
case MessageTypes.Notice:
case MessageTypes.Emote:
default:
return LinkText(
text: event.getLocalizedBody(context, hideReply: true),
textStyle: TextStyle(
@ -142,12 +144,7 @@ class MessageContent extends StatelessWidget {
),
);
}
return Text(
event.getLocalizedBody(context),
style: TextStyle(
color: textColor,
),
);
break;
default:
return Text(
I18n.of(context).userSentUnknownEvent(

7
lib/utils/event_extension.dart
View file

@ -168,8 +168,6 @@ extension LocalizedBody on Event {
}
break;
case EventTypes.Encrypted:
localizedBody = I18n.of(context).couldNotDecryptMessage;
break;
case EventTypes.Message:
switch (this.messageType) {
case MessageTypes.Image:
@ -211,7 +209,10 @@ extension LocalizedBody on Event {
// Hide reply fallback
if (hideReply) {
localizedBody = localizedBody.replaceFirst(RegExp(r'^>( \*)? <@[a-zA-Z0-9-.=_\/]+:[^>]+>[^\n]+\r?\n(> [^\n]+\r?\n)*\r?\n'), "");
localizedBody = localizedBody.replaceFirst(
RegExp(
r'^>( \*)? <@[a-zA-Z0-9-.=_\/]+:[^>]+>[^\n]+\r?\n(> [^\n]+\r?\n)*\r?\n'),
"");
}
// Add the sender name prefix