clean up context locators

lib/chat/cubits/chat_component_cubit.dart

@@ -8,6 +8,7 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
 import 'package:flutter_chat_ui/flutter_chat_ui.dart';
+import 'package:provider/provider.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
 import 'package:veilid_support/veilid_support.dart';
 
@@ -44,23 +45,28 @@ class ChatComponentCubit extends Cubit<ChatComponentState> {
 
   // ignore: prefer_constructors_over_static_methods
   static ChatComponentCubit singleContact(
-      {required UnlockedAccountInfo activeAccountInfo,
-      required proto.Account accountRecordInfo,
-      required ActiveConversationState activeConversationState,
+      {required Locator locator,
+      required ActiveConversationCubit activeConversationCubit,
       required SingleContactMessagesCubit messagesCubit}) {
+    // Get account info
+    final unlockedAccountInfo =
+        locator<ActiveAccountInfoCubit>().state.unlockedAccountInfo!;
+    final account = locator<AccountRecordCubit>().state.asData!.value;
+
     // Make local 'User'
-    final localUserIdentityKey = activeAccountInfo.identityTypedPublicKey;
+    final localUserIdentityKey = unlockedAccountInfo.identityTypedPublicKey;
     final localUser = types.User(
         id: localUserIdentityKey.toString(),
-        firstName: accountRecordInfo.profile.name,
+        firstName: account.profile.name,
         metadata: {metadataKeyIdentityPublicKey: localUserIdentityKey});
+
     // Make remote 'User's
     final remoteUsers = {
       activeConversationState.contact.identityPublicKey.toVeilid(): types.User(
           id: activeConversationState.contact.identityPublicKey
               .toVeilid()
               .toString(),
-          firstName: activeConversationState.contact.editedProfile.name,
+          firstName: activeConversationState.contact.displayName,
           metadata: {
             metadataKeyIdentityPublicKey:
                 activeConversationState.contact.identityPublicKey.toVeilid()

lib/chat/cubits/single_contact_messages_cubit.dart

@@ -4,6 +4,7 @@ import 'package:async_tools/async_tools.dart';
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:provider/provider.dart';
 import 'package:veilid_support/veilid_support.dart';
 
 import '../../account_manager/account_manager.dart';
@@ -50,13 +51,13 @@ typedef SingleContactMessagesState = AsyncValue<WindowState<MessageState>>;
 // Builds the reconciled chat record from the local and remote conversation keys
 class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
   SingleContactMessagesCubit({
-    required UnlockedAccountInfo activeAccountInfo,
+    required Locator locator,
     required TypedKey remoteIdentityPublicKey,
     required TypedKey localConversationRecordKey,
     required TypedKey localMessagesRecordKey,
     required TypedKey remoteConversationRecordKey,
     required TypedKey remoteMessagesRecordKey,
-  })  : _activeAccountInfo = activeAccountInfo,
+  })  : _locator = locator,
         _remoteIdentityPublicKey = remoteIdentityPublicKey,
         _localConversationRecordKey = localConversationRecordKey,
         _localMessagesRecordKey = localMessagesRecordKey,
@@ -86,6 +87,9 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
 
   // Initialize everything
   Future<void> _init() async {
+    _unlockedAccountInfo =
+        _locator<ActiveAccountInfoCubit>().state.unlockedAccountInfo!;
+
     _unsentMessagesQueue = PersistentQueue<proto.Message>(
       table: 'SingleContactUnsentMessages',
       key: _remoteConversationRecordKey.toString(),
@@ -111,15 +115,15 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
 
   // Make crypto
   Future<void> _initCrypto() async {
-    _conversationCrypto = await _activeAccountInfo
+    _conversationCrypto = await _unlockedAccountInfo
         .makeConversationCrypto(_remoteIdentityPublicKey);
     _senderMessageIntegrity = await MessageIntegrity.create(
-        author: _activeAccountInfo.identityTypedPublicKey);
+        author: _unlockedAccountInfo.identityTypedPublicKey);
   }
 
   // Open local messages key
   Future<void> _initSentMessagesCubit() async {
-    final writer = _activeAccountInfo.identityWriter;
+    final writer = _unlockedAccountInfo.identityWriter;
 
     _sentMessagesCubit = DHTLogCubit(
         open: () async => DHTLog.openWrite(_localMessagesRecordKey, writer,
@@ -149,7 +153,7 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
 
   Future<VeilidCrypto> _makeLocalMessagesCrypto() async =>
       VeilidCryptoPrivate.fromTypedKey(
-          _activeAccountInfo.userLogin.identitySecret, 'tabledb');
+          _unlockedAccountInfo.userLogin.identitySecret, 'tabledb');
 
   // Open reconciled chat record key
   Future<void> _initReconciledMessagesCubit() async {
@@ -240,8 +244,10 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
       return;
     }
 
-    _reconciliation.reconcileMessages(_activeAccountInfo.identityTypedPublicKey,
-        sentMessages, _sentMessagesCubit!);
+    _reconciliation.reconcileMessages(
+        _unlockedAccountInfo.identityTypedPublicKey,
+        sentMessages,
+        _sentMessagesCubit!);
 
     // Update the view
     _renderState();
@@ -278,7 +284,7 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
 
     // Now sign it
     await _senderMessageIntegrity.signMessage(
-        message, _activeAccountInfo.identitySecretKey);
+        message, _unlockedAccountInfo.identitySecretKey);
   }
 
   // Async process to send messages in the background
@@ -331,7 +337,7 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
 
     for (final m in reconciledMessages.windowElements) {
       final isLocal = m.content.author.toVeilid() ==
-          _activeAccountInfo.identityTypedPublicKey;
+          _unlockedAccountInfo.identityTypedPublicKey;
       final reconciledTimestamp = Timestamp.fromInt64(m.reconciledTime);
       final sm =
           isLocal ? sentMessagesMap[m.content.authorUniqueIdString] : null;
@@ -369,7 +375,7 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
     // Add common fields
     // id and signature will get set by _processMessageToSend
     message
-      ..author = _activeAccountInfo.identityTypedPublicKey.toProto()
+      ..author = _unlockedAccountInfo.identityTypedPublicKey.toProto()
       ..timestamp = Veilid.instance.now().toInt64();
 
     // Put in the queue
@@ -402,7 +408,8 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
   /////////////////////////////////////////////////////////////////////////
 
   final WaitSet<void> _initWait = WaitSet();
-  final UnlockedAccountInfo _activeAccountInfo;
+  final Locator _locator;
+  late final UnlockedAccountInfo _unlockedAccountInfo;
   final TypedKey _remoteIdentityPublicKey;
   final TypedKey _localConversationRecordKey;
   final TypedKey _localMessagesRecordKey;

lib/chat/views/chat_component_widget.dart

@@ -22,26 +22,15 @@ class ChatComponentWidget extends StatelessWidget {
   static Widget builder(
           {required TypedKey localConversationRecordKey, Key? key}) =>
       Builder(builder: (context) {
-        // Get all watched dependendies
-        final activeAccountInfo = context.watch<UnlockedAccountInfo>();
-        final accountRecordInfo =
-            context.watch<AccountRecordCubit>().state.asData?.value;
-        if (accountRecordInfo == null) {
-          return debugPage('should always have an account record here');
-        }
-
-        final avconversation = context.select<ActiveConversationsBlocMapCubit,
-                AsyncValue<ActiveConversationState>?>(
-            (x) => x.state[localConversationRecordKey]);
-        if (avconversation == null) {
+        // Get the active conversation cubit
+        final activeConversationCubit = context
+            .select<ActiveConversationsBlocMapCubit, ActiveConversationCubit?>(
+                (x) => x.tryOperate(localConversationRecordKey,
+                    closure: (cubit) => cubit));
+        if (activeConversationCubit == null) {
           return waitingPage();
         }
 
-        final activeConversationState = avconversation.asData?.value;
-        if (activeConversationState == null) {
-          return avconversation.buildNotData();
-        }
-
         // Get the messages cubit
         final messagesCubit = context.select<
                 ActiveSingleContactChatBlocMapCubit,
@@ -55,9 +44,8 @@ class ChatComponentWidget extends StatelessWidget {
         // Make chat component state
         return BlocProvider(
             create: (context) => ChatComponentCubit.singleContact(
-                  activeAccountInfo: activeAccountInfo,
-                  accountRecordInfo: accountRecordInfo,
-                  activeConversationState: activeConversationState,
+                  locator: context.read,
+                  activeConversationCubit: activeConversationCubit,
                   messagesCubit: messagesCubit,
                 ),
             child: ChatComponentWidget._(key: key));