chore: fix high cpu usage with unedited messages containing emojis

Author: Feichtmeier

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ on:
     branches: [main]
 
 env:
-  FLUTTER_VERSION: '3.29.0'
+  FLUTTER_VERSION: '3.29.1'
 
 jobs:
   analyze:

lib/chat/chat_room/common/timeline_model.dart

@@ -28,6 +28,7 @@ class TimelineModel extends SafeChangeNotifier {
     }
 
     await timeline.requestHistory(filter: filter, historyCount: historyCount);
+    await timeline.room.requestParticipants();
     if (notify) {
       setUpdatingTimeline(roomId: timeline.room.id, value: false);
     }

lib/chat/chat_room/common/view/chat_seen_by_indicator.dart

@@ -21,13 +21,8 @@ class ChatEventSeenByIndicator extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
-    watchFuture(
-      (ChatModel m) => m.requestParticipants(event.room),
-      initialValue: event.room.getParticipants(),
-    );
-
     final seenByUsers = watchStream(
-          (ChatModel m) => m.getRoomsReceipts(event),
+          (ChatModel m) => m.getRoomsReceiptsStream(event),
           initialValue: event.receipts,
         )
             .data

lib/chat/common/chat_model.dart

@@ -56,12 +56,9 @@ class ChatModel extends SafeChangeNotifier {
   /// The unfiltered onSync stream of the [Client]
   Stream<SyncUpdate> get syncStream => _client.onSync.stream;
 
-  Stream<List<Receipt>> getRoomsReceipts(Event event) =>
+  Stream<List<Receipt>> getRoomsReceiptsStream(Event event) =>
       getJoinedRoomUpdate(event.room.id).map((_) => event.receipts);
 
-  Future<List<User>> requestParticipants(Room room) async =>
-      room.requestParticipants();
-
   Stream<List<User>> getUsersStreamOfJoinedRoom(
     Room room, {
     List<Membership> membershipFilter = const [

lib/chat/settings/settings_service.dart

@@ -1,16 +1,16 @@
 import 'dart:async';
 
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-const _kShowChatAvatarChangesKey = 'showChatAvatarChanges';
-const _kShowChatDisplaynameChangesKey = 'showChatDisplaynameChanges';
-
 class SettingsService {
-  SettingsService({required SharedPreferences sharedPreferences})
-      : _sharedPreferences = sharedPreferences;
-
-  Future<void> dispose() async => _propertiesChangedController.close();
+  SettingsService({
+    required SharedPreferences sharedPreferences,
+    required FlutterSecureStorage secureStorage,
+  })  : _sharedPreferences = sharedPreferences,
+        _secureStorage = secureStorage;
 
+  final FlutterSecureStorage _secureStorage;
   final SharedPreferences _sharedPreferences;
   final _propertiesChangedController = StreamController<bool>.broadcast();
   Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
@@ -19,14 +19,51 @@ class SettingsService {
   }
 
   bool get showAvatarChanges =>
-      _sharedPreferences.getBool(_kShowChatAvatarChangesKey) ?? false;
+      _sharedPreferences.getBool(SettingKeys.showChatAvatarChanges) ?? false;
   void setShowAvatarChanges(bool value) => _sharedPreferences
-      .setBool(_kShowChatAvatarChangesKey, value)
+      .setBool(SettingKeys.showChatAvatarChanges, value)
       .then(notify);
 
   bool get showChatDisplaynameChanges =>
-      _sharedPreferences.getBool(_kShowChatDisplaynameChangesKey) ?? false;
+      _sharedPreferences.getBool(SettingKeys.showChatDisplaynameChanges) ??
+      false;
   void setShowChatDisplaynameChanges(bool value) => _sharedPreferences
-      .setBool(_kShowChatDisplaynameChangesKey, value)
+      .setBool(SettingKeys.showChatDisplaynameChanges, value)
       .then(notify);
+
+  Object? get<T>(String key) => switch (T) {
+        const (String) => _sharedPreferences.getString(key),
+        const (bool) => _sharedPreferences.getBool(key),
+        const (double) => _sharedPreferences.getDouble(key),
+        const (int) => _sharedPreferences.getInt(key),
+        const (List<String>) => _sharedPreferences.getStringList(key),
+        _ => throw Exception('Invalid type'),
+      };
+
+  void set({required String key, required Object value}) => switch (value) {
+        const (String) =>
+          _sharedPreferences.setString(key, value as String).then(notify),
+        const (bool) =>
+          _sharedPreferences.setBool(key, value as bool).then(notify),
+        const (double) =>
+          _sharedPreferences.setDouble(key, value as double).then(notify),
+        const (int) =>
+          _sharedPreferences.setInt(key, value as int).then(notify),
+        const (List<String>) => _sharedPreferences
+            .setStringList(key, value as List<String>)
+            .then(notify),
+        _ => throw Exception('Invalid type'),
+      };
+
+  Future<String?> getSecure<T>(String key) => _secureStorage.read(key: key);
+
+  void setSecure({required String key, required String value}) =>
+      _secureStorage.write(key: key, value: value).then((_) => notify(true));
+
+  Future<void> dispose() async => _propertiesChangedController.close();
+}
+
+class SettingKeys {
+  static const showChatAvatarChanges = 'showChatAvatarChanges';
+  static const showChatDisplaynameChanges = 'showChatDisplaynameChanges';
 }

lib/register.dart

@@ -42,6 +42,7 @@ void registerDependencies() => di
   ..registerSingletonWithDependencies<SettingsService>(
     () => SettingsService(
       sharedPreferences: di<SharedPreferences>(),
+      secureStorage: di<FlutterSecureStorage>(),
     ),
     dispose: (s) => s.dispose(),
     dependsOn: [SharedPreferences],

pubspec.lock

@@ -1766,4 +1766,4 @@ packages:
     version: "0.0.3+1"
 sdks:
   dart: ">=3.7.0 <4.0.0"
-  flutter: ">=3.29.0"
+  flutter: ">=3.29.1"

pubspec.yaml

@@ -7,7 +7,7 @@ version: 1.0.0+1
 
 environment:
   sdk: ">=3.4.4 <4.0.0"
-  flutter: ">=3.29.0"
+  flutter: ">=3.29.1"
 
 dependencies:
   adaptive_dialog: ^2.3.0