From fdaa1ff7dd0d5ecdadede21a3b7569ddc8183a6e Mon Sep 17 00:00:00 2001
From: otsmr <git@tsmr.eu>
Date: Mon, 3 Feb 2025 00:16:05 +0100
Subject: [PATCH] small fixes

---
 lib/src/model/contacts_model.dart             | 44 ++++++++++++-------
 lib/src/providers/api/api.dart                |  1 -
 lib/src/providers/api/server_messages.dart    |  3 +-
 .../camera_to_share/camera_preview_view.dart  |  8 ++--
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/lib/src/model/contacts_model.dart b/lib/src/model/contacts_model.dart
index b96fb55..8767932 100644
--- a/lib/src/model/contacts_model.dart
+++ b/lib/src/model/contacts_model.dart
@@ -1,5 +1,6 @@
 import 'package:cv/cv.dart';
 import 'package:fixnum/fixnum.dart';
+import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:twonly/main.dart';
 import 'package:twonly/src/app.dart';
@@ -53,6 +54,8 @@ class DbContacts extends CvModelBase {
   static const columnCreatedAt = "created_at";
   final createdAt = CvField<DateTime>(columnCreatedAt);
 
+  static const nextFlameCounterInSeconds = kDebugMode ? 60 : 60 * 60 * 24;
+
   static String getCreateTableString() {
     return """
       CREATE TABLE IF NOT EXISTS $tableName (
@@ -77,7 +80,9 @@ class DbContacts extends CvModelBase {
     return (await getUsers()).where((u) => u.accepted).toList();
   }
 
-  static Future checkAndUpdateFlames(int userId) async {
+  static Future checkAndUpdateFlames(int userId, {DateTime? timestamp}) async {
+    timestamp ??= DateTime.now();
+
     List<Map<String, dynamic>> result = await dbProvider.db!.query(
       tableName,
       columns: [
@@ -91,27 +96,31 @@ class DbContacts extends CvModelBase {
 
     if (result.isNotEmpty) {
       String lastUpdateString = result.first[columnLastUpdateOfFlameCounter];
-      DateTime? lastUpdate = DateTime.tryParse(lastUpdateString);
+      DateTime lastUpdate = DateTime.tryParse(lastUpdateString)!;
 
-      int currentCount = result.first.cast()[columnFlameCounter];
-      int totalMediaCounter = result.first.cast()[columnTotalMediaCounter];
-      if (lastUpdate != null &&
-          lastUpdate.isAfter(DateTime.now().subtract(Duration(hours: 24)))) {
-        _updateFlameCounter(userId, currentCount,
-            totalMediaCounter: totalMediaCounter + 1); // just update the time
-      } else {
-        _updateFlameCounter(userId, (currentCount + 1),
-            totalMediaCounter: totalMediaCounter + 1);
+      if (timestamp.isAfter(lastUpdate)) {
+        int currentCount = result.first.cast()[columnFlameCounter];
+        int totalMediaCounter = result.first.cast()[columnTotalMediaCounter];
+        if (lastUpdate.isAfter(DateTime.now()
+            .subtract(Duration(seconds: nextFlameCounterInSeconds)))) {
+          _updateFlameCounter(userId, currentCount,
+              totalMediaCounter: totalMediaCounter + 1,
+              timestamp: timestamp); // just update the time
+        } else {
+          _updateFlameCounter(userId, (currentCount + 1),
+              totalMediaCounter: totalMediaCounter + 1, timestamp: timestamp);
+        }
       }
     }
     globalCallBackOnContactChange();
   }
 
   static Future _updateFlameCounter(int userId, int newCount,
-      {int? totalMediaCounter}) async {
+      {DateTime? timestamp, int? totalMediaCounter}) async {
+    timestamp ??= DateTime.now();
     Map<String, dynamic> valuesToUpdate = {
       columnFlameCounter: newCount,
-      columnLastUpdateOfFlameCounter: DateTime.now().toIso8601String()
+      columnLastUpdateOfFlameCounter: timestamp.toIso8601String()
     };
     if (totalMediaCounter != null) {
       valuesToUpdate[columnTotalMediaCounter] = totalMediaCounter;
@@ -149,10 +158,11 @@ class DbContacts extends CvModelBase {
 
         int flameCounter = users.cast()[i][columnFlameCounter];
 
-        if (lastUpdate.isBefore(DateTime.now().subtract(Duration(days: 2)))) {
-          _updateFlameCounter(userId, 0);
-          flameCounter = 0;
-        }
+        // if (lastUpdate.isBefore(DateTime.now()
+        //     .subtract(Duration(seconds: nextFlameCounterInSeconds * 2)))) {
+        //   _updateFlameCounter(userId, 0);
+        //   flameCounter = 0;
+        // }
 
         parsedUsers.add(
           Contact(
diff --git a/lib/src/providers/api/api.dart b/lib/src/providers/api/api.dart
index ac45179..16b09ae 100644
--- a/lib/src/providers/api/api.dart
+++ b/lib/src/providers/api/api.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:io';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/foundation.dart';
diff --git a/lib/src/providers/api/server_messages.dart b/lib/src/providers/api/server_messages.dart
index c068e79..1e2a87c 100644
--- a/lib/src/providers/api/server_messages.dart
+++ b/lib/src/providers/api/server_messages.dart
@@ -148,7 +148,8 @@ Future<client.Response> handleNewMessage(
 
           if (message.kind == MessageKind.video ||
               message.kind == MessageKind.image) {
-            await DbContacts.checkAndUpdateFlames(fromUserId.toInt());
+            await DbContacts.checkAndUpdateFlames(fromUserId.toInt(),
+                timestamp: message.timestamp);
 
             dynamic content = message.content!;
             List<int> downloadToken = content.downloadToken;
diff --git a/lib/src/views/camera_to_share/camera_preview_view.dart b/lib/src/views/camera_to_share/camera_preview_view.dart
index ee495ca..a1247cc 100644
--- a/lib/src/views/camera_to_share/camera_preview_view.dart
+++ b/lib/src/views/camera_to_share/camera_preview_view.dart
@@ -94,9 +94,11 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
                         reverseTransitionDuration: Duration.zero,
                       ),
                     );
-                    setState(() {
-                      sharePreviewIsShown = false;
-                    });
+                    if (context.mounted) {
+                      setState(() {
+                        sharePreviewIsShown = false;
+                      });
+                    }
                   },
                   multiple: (multiple) {
                     multiple.fileBySensor.forEach((key, value) {