From c6f5fcb5e85d54b92e9c022b258a2ed8ecd239aa Mon Sep 17 00:00:00 2001
From: Christian Pauly <christianpauly@Christians-Air.fritz.box>
Date: Fri, 21 Feb 2020 09:45:37 +0100
Subject: [PATCH] Update SDK

---
 lib/components/list_items/message.dart | 3 ++-
 lib/components/message_content.dart    | 9 +++------
 lib/utils/event_extension.dart         | 7 ++++---
 pubspec.lock                           | 4 ++--
 pubspec.yaml                           | 2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart
index d119e5e..04faa24 100644
--- a/lib/components/list_items/message.dart
+++ b/lib/components/list_items/message.dart
@@ -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);
     }
 
diff --git a/lib/components/message_content.dart b/lib/components/message_content.dart
index 82906f5..80a2bbd 100644
--- a/lib/components/message_content.dart
+++ b/lib/components/message_content.dart
@@ -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(
diff --git a/lib/utils/event_extension.dart b/lib/utils/event_extension.dart
index 865bc01..3a031bc 100644
--- a/lib/utils/event_extension.dart
+++ b/lib/utils/event_extension.dart
@@ -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
diff --git a/pubspec.lock b/pubspec.lock
index 3051a69..c0174a3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -124,8 +124,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "6dd3b879b6cfcf1c7da9dedfa62626237afa6d9a"
-      resolved-ref: "6dd3b879b6cfcf1c7da9dedfa62626237afa6d9a"
+      ref: f6379597ed403f340601a27a3ef6b2b971ac1c27
+      resolved-ref: f6379597ed403f340601a27a3ef6b2b971ac1c27
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index c18c1ec..59bd4cf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,7 +27,7 @@ dependencies:
   famedlysdk:
     git:
       url: https://gitlab.com/famedly/famedlysdk.git
-      ref: 5a4c484db62234ac8c782bf03f121e8687a07836
+      ref: f6379597ed403f340601a27a3ef6b2b971ac1c27
 
   localstorage: ^3.0.1+4
   bubble: ^1.1.9+1