Handled case where some kind 40 don't have json, only text; otherwise…

… it was crashing on starting
vishalxl · Jun 9, 2024 · f61a6bb · f61a6bb
1 parent 9f507cc
commit f61a6bb
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/lib/tree_ds.dart b/lib/tree_ds.dart
@@ -846,21 +846,27 @@ class Store {
 
         try {
           dynamic json = jsonDecode(ce.eventData.content);
-          Channel? channel = getChannel(rooms, chatRoomId);
-          if( channel != null) {
-            if( channel.chatRoomName == "" && json.containsKey('name')) {
-              channel.chatRoomName = json['name'];
-            }
-          } else {
-            String roomName = "", roomAbout = "";
+          String roomName = "", roomAbout = "";
+          if( json is String) {
+            // in case there is no json in kind 40, we assume the string is room name
+            roomName = json;
+          } else {           
             if(  json.containsKey('name') ) {
               roomName = json['name']??"";
             }
 
             if( json.containsKey('about')) {
               roomAbout = json['about']??"";
             }
-
+          }
+
+          Channel? channel = getChannel(rooms, chatRoomId);
+          if( channel != null) {
+            if( channel.chatRoomName == "" ) {
+              channel.chatRoomName = roomName;
+            }
+          } else {
+
             List<String> emptyMessageList = [];
             Channel room = Channel(chatRoomId, roomName, roomAbout, "", emptyMessageList, {}, ce.eventData.createdAt, enumRoomType.kind40);
             rooms.add( room);