From d5bfd5944ab3b57f72db8137956df6313a5fe437 Mon Sep 17 00:00:00 2001
From: otsmr <git@tsmr.eu>
Date: Fri, 7 Feb 2025 19:52:14 +0100
Subject: [PATCH] some bug fixes

---
 lib/src/components/best_friends_selector.dart       | 8 ++++----
 lib/src/model/messages_model.dart                   | 2 +-
 lib/src/providers/api/api.dart                      | 3 +--
 lib/src/views/camera_to_share/share_image_view.dart | 9 ++++-----
 lib/src/views/chats/chat_list_view.dart             | 8 ++++----
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/lib/src/components/best_friends_selector.dart b/lib/src/components/best_friends_selector.dart
index 84a5edd..aa10299 100644
--- a/lib/src/components/best_friends_selector.dart
+++ b/lib/src/components/best_friends_selector.dart
@@ -89,10 +89,10 @@ class UserCheckbox extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    int? flameCounter = context
-        .watch<MessagesChangeProvider>()
-        .flamesCounter[user.userId.toInt()];
-    flameCounter ??= 0;
+    int flameCounter = context
+            .watch<MessagesChangeProvider>()
+            .flamesCounter[user.userId.toInt()] ??
+        0;
 
     return Container(
       padding:
diff --git a/lib/src/model/messages_model.dart b/lib/src/model/messages_model.dart
index 0b5a834..a08e040 100644
--- a/lib/src/model/messages_model.dart
+++ b/lib/src/model/messages_model.dart
@@ -225,7 +225,7 @@ class DbMessages extends CvModelBase {
       tableName,
       where: "$columnOtherUserId = ?",
       whereArgs: [otherUserId],
-      orderBy: "$columnUpdatedAt DESC",
+      orderBy: "$columnSendAt DESC",
     );
 
     List<DbMessage> messages = await convertToDbMessage(rows);
diff --git a/lib/src/providers/api/api.dart b/lib/src/providers/api/api.dart
index 7ec809f..36e6029 100644
--- a/lib/src/providers/api/api.dart
+++ b/lib/src/providers/api/api.dart
@@ -83,8 +83,7 @@ Future<Result> encryptAndSendMessage(Int64 userId, Message msg) async {
 Future sendTextMessage(Int64 target, String message) async {
   MessageContent content = TextMessageContent(text: message);
 
-  DateTime messageSendAt =
-      DateTime.now().subtract(Duration(days: 1, minutes: 120));
+  DateTime messageSendAt = DateTime.now();
 
   int? messageId = await DbMessages.insertMyMessage(
       target.toInt(), MessageKind.textMessage, content, messageSendAt);
diff --git a/lib/src/views/camera_to_share/share_image_view.dart b/lib/src/views/camera_to_share/share_image_view.dart
index 3fe4ffc..8c5a7b5 100644
--- a/lib/src/views/camera_to_share/share_image_view.dart
+++ b/lib/src/views/camera_to_share/share_image_view.dart
@@ -59,8 +59,8 @@ class _ShareImageView extends State<ShareImageView> {
     // Sort contacts by flameCounter and then by totalMediaCounter
     users.sort((a, b) {
       // First, compare by flameCounter
-      int flameComparison = flameCounters[b.userId.toInt()]!
-          .compareTo(flameCounters[a.userId.toInt()]!);
+      int flameComparison = (flameCounters[b.userId.toInt()] ?? 0)
+          .compareTo((flameCounters[a.userId.toInt()] ?? 0));
       if (flameComparison != 0) {
         return flameComparison; // Sort by flameCounter in descending order
       }
@@ -80,7 +80,7 @@ class _ShareImageView extends State<ShareImageView> {
     List<Contact> otherUsers = [];
 
     for (var contact in users) {
-      if (flameCounters[contact.userId.toInt()]! > 0 &&
+      if ((flameCounters[contact.userId.toInt()] ?? 0) > 0 &&
           bestFriends.length < 6) {
         bestFriends.add(contact);
       } else {
@@ -231,8 +231,7 @@ class UserList extends StatelessWidget {
       itemCount: users.length,
       itemBuilder: (BuildContext context, int i) {
         Contact user = users[i];
-        int? flameCounter = flameCounters[user.userId.toInt()];
-        flameCounter ??= 0;
+        int flameCounter = flameCounters[user.userId.toInt()] ?? 0;
         return ListTile(
           title: Row(children: [
             Text(user.displayName),
diff --git a/lib/src/views/chats/chat_list_view.dart b/lib/src/views/chats/chat_list_view.dart
index e09937d..6ce12d2 100644
--- a/lib/src/views/chats/chat_list_view.dart
+++ b/lib/src/views/chats/chat_list_view.dart
@@ -182,10 +182,10 @@ class _UserListItem extends State<UserListItem> {
           .contains(token.toString());
     }
 
-    int? flameCounter = context
-        .watch<MessagesChangeProvider>()
-        .flamesCounter[widget.user.userId.toInt()];
-    flameCounter ??= 0;
+    int flameCounter = context
+            .watch<MessagesChangeProvider>()
+            .flamesCounter[widget.user.userId.toInt()] ??
+        0;
 
     return UserContextMenu(
       user: widget.user,