Merge branch 'main' into new_appserver

# Conflicts:
#	lib/content_views/approach_area_page.dart
#	lib/content_views/assigned_jobs_page.dart
#	lib/content_views/main_page.dart
#	lib/content_views/task_list_page.dart
#	lib/main.dart
#	lib/popups/accept_jobs_popup.dart
#	lib/protocoll_messages/logout_message.dart
#	lib/protocoll_messages/logout_message.g.dart
#	lib/tools/constants.dart
#	lib/tools/mqtt_core.dart
#	pubspec.lock
#	pubspec.yaml

lib/content_views/messages_page.dart

@@ -8,6 +8,7 @@ import 'package:stadtbote/content_views/utils/content_view_widget.dart';
 import 'package:stadtbote/content_views/utils/header_info.dart';
 import 'package:stadtbote/main.dart';
 import 'package:stadtbote/model/message.dart' as sbmessage;
+import 'package:stadtbote/model/message.dart';
 import 'package:stadtbote/model/session_status.dart';
 import 'package:stadtbote/tools/mqtt_core.dart';
 
@@ -95,16 +96,17 @@ class _MessagesPageState extends State<MessagesPage> {
   void _handleSendPressed(types.PartialText text) async {
     var now = DateTime.now();
 
-    var message = sbmessage.Message();
-    message.text = [text.text];
-    message.from = _sid;
-    message.subj = '';
-    message.time = now.toIso8601String();
-    message.read = true;
-    message.id = await sbmessage.Message.getNextId();
+    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();
 
-    MyApp.isarInstance.writeTxnSync(() {
-      MyApp.isarInstance.messages.putSync(message);
+    await MyApp.isarInstance.writeTxn(() async {
+      await MyApp.isarInstance.messages.put(message.mssg);
     });
 
     var json = jsonEncode(message.toJson());
@@ -114,7 +116,7 @@ class _MessagesPageState extends State<MessagesPage> {
     _messages.insert(0, types.TextMessage(
       author: _user,
       createdAt: now.millisecondsSinceEpoch,
-      id: message.id.toString(),
+      id: message.mssg.id.toString(),
       text: text.text,
     ));
 
@@ -132,18 +134,18 @@ class _MessagesPageState extends State<MessagesPage> {
       }
       text = text.trim();
 
-      _messages.insert(0, types.TextMessage(
+      _messages.add(types.TextMessage(
         author: message.from == _sid ? _user : _central,
-        createdAt: DateTime
-            .parse(message.time)
-            .millisecondsSinceEpoch,
+        createdAt: DateTime.parse(message.time).toLocal().millisecondsSinceEpoch,
         id: message.id.toString(),
         text: text,
       ));
 
+      _messages.sort((a, b) => b.createdAt! > a.createdAt! ? 1 : 0);
+
       message.read = true;
-      MyApp.isarInstance.writeTxnSync(() {
-        MyApp.isarInstance.messages.putSync(message);
+      await MyApp.isarInstance.writeTxn(() async {
+        await MyApp.isarInstance.messages.put(message);
       });
     }
 
@@ -181,8 +183,8 @@ class _MessagesPageState extends State<MessagesPage> {
                               ),
                               const SizedBox(width: 20),
                               Expanded(
-                                child: getDefaultButton('Ja', () => {
-                                MyApp.isarInstance.writeTxnSync(() => {MyApp.isarInstance.messages.deleteSync(int.parse(message.id))}),
+                                child: getDefaultButton('Ja', () async => {
+                                await MyApp.isarInstance.writeTxnSync(() async => { await MyApp.isarInstance.messages.delete(int.parse(message.id))}),
 
                                 _fetchMessages(),