Erweiterungen

lib/content_views/messages_page.dart

@@ -96,25 +96,24 @@ class _MessagesPageState extends State<MessagesPage> {
   void _handleSendPressed(types.PartialText text) async {
     var now = DateTime.now();
 
-    var message = MessageMessage();
-    message.mssg = sbmessage.Message();
-    message.mssg.text = [text.text];
-    message.mssg.from = _sid;
-    message.mssg.subj = '';
-    message.mssg.time = now.toUtc().toIso8601String();
-    message.mssg.read = true;
-    message.mssg.id = await sbmessage.Message.getNextId();
+    var message = sbmessage.Message();
+    message.text = text.text;
+    message.from = _sid;
+    message.subj = '';
+    message.time = now.toUtc().toIso8601String();
+    message.read = true;
+    message.id = await sbmessage.Message.getNextId();
 
     await MyApp.isarInstance.writeTxn(() async {
-      await MyApp.isarInstance.messages.put(message.mssg);
+      await MyApp.isarInstance.messages.put(message);
     });
 
-    MqttCore.instance.publishMessage('set_location', jsonEncode(message.toJson()));
+    MqttCore.instance.publishMessage('message', jsonEncode(message.toJson()));
 
     _messages.insert(0, types.TextMessage(
       author: _user,
       createdAt: now.millisecondsSinceEpoch,
-      id: message.mssg.id.toString(),
+      id: message.id.toString(),
       text: text.text,
     ));
 
@@ -126,17 +125,11 @@ class _MessagesPageState extends State<MessagesPage> {
 
     var messages = await MyApp.isarInstance.messages.where().findAll();
     for (var message in messages) {
-      var text = message.subj.isNotEmpty ? '${message.subj}\n': '';
-      for (var textLine in message.text) {
-        text += '$textLine\n';
-      }
-      text = text.trim();
-
       _messages.add(types.TextMessage(
         author: message.from == _sid ? _user : _central,
         createdAt: DateTime.parse(message.time).toLocal().millisecondsSinceEpoch,
         id: message.id.toString(),
-        text: text,
+        text: message.text,
       ));
 
       _messages.sort((a, b) => b.createdAt! > a.createdAt! ? 1 : 0);