refactor: /simplify — 22 fixes from 3-agent code review
Critical: - Fix MXC URI resolution: all avatars/images now resolve mxc:// to HTTP - Sync persistence: only write changed rooms, batch message upserts - lastActivityAt uses room.lastEvent.originServerTs, not creation time High: - Shared MatrixAvatar widget replaces 6 duplicate implementations - CallScreen decodes roomId before LiveKit JWT fetch - Decline button actually dismisses incoming call overlay - EventTypes constants replace raw string literals - LiveKitService uses lazy auth reads, onDispose disconnects Medium: - CallController is keepAlive with timer/room cleanup - authRepository is keepAlive (used from keepAlive notifier) - StreamController not closed in stopListening (crash fix) - Index on messages.roomId for query performance - 400ms debounce on user search - Static DateFormat in MessageBubble - Hardcoded strings replaced with AppConfig refs - Duplicate isDirectMessage field removed from RoomModel - E2EE profile claim corrected to Phase 3 Shared utilities: - lib/shared/widgets/matrix_avatar.dart - lib/shared/utils/mxc_url.dart - lib/shared/utils/room_preview.dart - lib/shared/utils/matrix_id.dart rawJson column removed (unused, caused main-thread jsonEncode) Schema migrated to v2 with roomId index. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// Version: 1.1.0 | Created: 2026-04-01
|
||||
// Version: 1.2.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// LiveKitService — fetches a JWT from the Matrix server's /_matrix/livekit/jwt
|
||||
// endpoint, then connects a LiveKit Room using that token.
|
||||
//
|
||||
@@ -54,9 +54,9 @@ final class LiveKitFailed extends LiveKitResult {
|
||||
|
||||
/// Manages LiveKit room connections for MatrixRTC.
|
||||
class LiveKitService {
|
||||
LiveKitService({required AuthState authState}) : _authState = authState;
|
||||
LiveKitService({required Ref ref}) : _ref = ref;
|
||||
|
||||
final AuthState _authState;
|
||||
final Ref _ref;
|
||||
Room? _activeRoom;
|
||||
|
||||
Room? get activeRoom => _activeRoom;
|
||||
@@ -67,7 +67,7 @@ class LiveKitService {
|
||||
/// 1. GET `/_matrix/livekit/jwt?roomId={id}&userId={id}`
|
||||
/// 2. Use returned token + LiveKit WS URL to connect a [Room]
|
||||
Future<LiveKitResult> connect(String matrixRoomId) async {
|
||||
final auth = _authState;
|
||||
final auth = _ref.read(authProvider);
|
||||
if (auth is! AuthAuthenticated) {
|
||||
return const LiveKitFailed(LiveKitNotAuthenticated());
|
||||
}
|
||||
@@ -94,6 +94,7 @@ class LiveKitService {
|
||||
_activeRoom = room;
|
||||
return LiveKitConnected(room: room);
|
||||
} on Exception catch (e) {
|
||||
await room.disconnect();
|
||||
await room.dispose();
|
||||
return LiveKitFailed(LiveKitConnectFailed(e.toString()));
|
||||
}
|
||||
@@ -101,9 +102,12 @@ class LiveKitService {
|
||||
|
||||
/// Disconnect and dispose the active room.
|
||||
Future<void> disconnect() async {
|
||||
await _activeRoom?.disconnect();
|
||||
await _activeRoom?.dispose();
|
||||
final room = _activeRoom;
|
||||
_activeRoom = null;
|
||||
if (room != null) {
|
||||
await room.disconnect();
|
||||
await room.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
Future<_JwtFetchResult> _fetchJwt({
|
||||
@@ -159,6 +163,7 @@ final class _JwtError extends _JwtFetchResult {
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
LiveKitService liveKitService(Ref ref) {
|
||||
final authState = ref.watch(authProvider);
|
||||
return LiveKitService(authState: authState);
|
||||
final service = LiveKitService(ref: ref);
|
||||
ref.onDispose(() async => service.disconnect());
|
||||
return service;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Version: 1.1.0 | Created: 2026-04-01
|
||||
// Version: 1.2.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// MatrixRTC repository — handles outgoing call invites and detects incoming
|
||||
// calls via m.call.invite events per MSC4143 (MatrixRTC spec).
|
||||
//
|
||||
@@ -13,6 +13,8 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import '../../../core/auth/auth_notifier.dart';
|
||||
import '../../../core/auth/auth_state.dart';
|
||||
import '../../../core/network/matrix_client.dart';
|
||||
import '../../../shared/utils/matrix_id.dart';
|
||||
import '../../../shared/utils/mxc_url.dart';
|
||||
import '../domain/incoming_call.dart';
|
||||
|
||||
part 'matrixrtc_repository.g.dart';
|
||||
@@ -42,6 +44,11 @@ class MatrixRtcRepository {
|
||||
void stopListening() {
|
||||
_eventSubscription?.cancel();
|
||||
_eventSubscription = null;
|
||||
}
|
||||
|
||||
/// Close the stream controller. Called from ref.onDispose only.
|
||||
void dispose() {
|
||||
stopListening();
|
||||
_incomingCallController.close();
|
||||
}
|
||||
|
||||
@@ -59,7 +66,7 @@ class MatrixRtcRepository {
|
||||
final callId = 'call_${DateTime.now().millisecondsSinceEpoch}';
|
||||
|
||||
await room.sendEvent({
|
||||
'msgtype': 'm.call.invite',
|
||||
'msgtype': EventTypes.CallInvite,
|
||||
'call_id': callId,
|
||||
'lifetime': 60000, // 60 seconds before invite expires
|
||||
'offer': {
|
||||
@@ -69,12 +76,12 @@ class MatrixRtcRepository {
|
||||
'version': '1',
|
||||
'invitee': null, // null = invite entire room
|
||||
'm.intentional_mentions': {'user_ids': [], 'room': false},
|
||||
}, type: 'm.call.invite');
|
||||
}, type: EventTypes.CallInvite);
|
||||
}
|
||||
|
||||
void _onEvent(EventUpdate update) {
|
||||
if (update.type != EventUpdateType.timeline) return;
|
||||
if (update.content['type'] != 'm.call.invite') return;
|
||||
if (update.content['type'] != EventTypes.CallInvite) return;
|
||||
|
||||
final senderId = update.content['sender'] as String?;
|
||||
// Ignore our own invites.
|
||||
@@ -98,8 +105,8 @@ class MatrixRtcRepository {
|
||||
roomId: roomId,
|
||||
callerId: senderId ?? '',
|
||||
callerDisplayName:
|
||||
senderProfile?.displayName ?? senderId?.split(':').first ?? '',
|
||||
callerAvatarUrl: senderProfile?.avatarUrl?.toString(),
|
||||
senderProfile?.displayName ?? senderId?.matrixLocalpart ?? '',
|
||||
callerAvatarUrl: resolveMxcUrl(_client, senderProfile?.avatarUrl),
|
||||
isVideo: (content['offer'] != null),
|
||||
),
|
||||
);
|
||||
@@ -114,6 +121,6 @@ MatrixRtcRepository matrixRtcRepository(Ref ref) {
|
||||
|
||||
final repo = MatrixRtcRepository(client: client, myUserId: myUserId);
|
||||
repo.startListening();
|
||||
ref.onDispose(repo.stopListening);
|
||||
ref.onDispose(repo.dispose);
|
||||
return repo;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Version: 1.1.0 | Created: 2026-04-01
|
||||
// Version: 1.2.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// Call controller — manages LiveKit room connection lifecycle.
|
||||
// Transitions through idle → connecting → active → ended states.
|
||||
|
||||
@@ -12,13 +12,20 @@ import '../domain/call_state.dart';
|
||||
|
||||
part 'call_controller.g.dart';
|
||||
|
||||
@Riverpod(keepAlive: false)
|
||||
@Riverpod(keepAlive: true)
|
||||
class CallController extends _$CallController {
|
||||
Timer? _durationTimer;
|
||||
Duration _elapsed = Duration.zero;
|
||||
|
||||
@override
|
||||
CallState build() => const CallState.idle();
|
||||
CallState build() {
|
||||
ref.onDispose(() {
|
||||
_durationTimer?.cancel();
|
||||
_durationTimer = null;
|
||||
ref.read(liveKitServiceProvider).disconnect();
|
||||
});
|
||||
return const CallState.idle();
|
||||
}
|
||||
|
||||
/// Join a LiveKit room via MatrixRTC JWT endpoint.
|
||||
///
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Version: 1.1.0 | Created: 2026-04-01
|
||||
// Version: 1.2.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// Full call screen with LiveKit video/audio.
|
||||
// - Remote video: full screen background
|
||||
// - Local video: picture-in-picture overlay (bottom right)
|
||||
@@ -33,7 +33,7 @@ class _CallScreenState extends ConsumerState<CallScreen> {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
ref
|
||||
.read(callControllerProvider.notifier)
|
||||
.joinCall(widget.roomId, withVideo: true);
|
||||
.joinCall(Uri.decodeComponent(widget.roomId), withVideo: true);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
// Version: 1.1.0 | Created: 2026-04-01
|
||||
// Version: 1.2.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// IncomingCallOverlay — full-screen overlay shown when an m.call.invite
|
||||
// arrives. Displays caller name/avatar, and Accept / Decline buttons.
|
||||
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
import '../../../shared/widgets/matrix_avatar.dart';
|
||||
import '../data/matrixrtc_repository.dart';
|
||||
import '../domain/incoming_call.dart';
|
||||
|
||||
@@ -58,14 +58,24 @@ class IncomingCallOverlayHost extends ConsumerWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _IncomingCallOverlay extends ConsumerWidget {
|
||||
class _IncomingCallOverlay extends StatefulWidget {
|
||||
const _IncomingCallOverlay({required this.call});
|
||||
|
||||
final IncomingCall call;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
State<_IncomingCallOverlay> createState() => _IncomingCallOverlayState();
|
||||
}
|
||||
|
||||
class _IncomingCallOverlayState extends State<_IncomingCallOverlay> {
|
||||
bool _dismissed = false;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (_dismissed) return const SizedBox.shrink();
|
||||
|
||||
final theme = Theme.of(context);
|
||||
final call = widget.call;
|
||||
|
||||
return Positioned.fill(
|
||||
child: Material(
|
||||
@@ -75,7 +85,13 @@ class _IncomingCallOverlay extends ConsumerWidget {
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
// Caller avatar
|
||||
_CallerAvatar(call: call),
|
||||
MatrixAvatar(
|
||||
name: call.callerDisplayName.isNotEmpty
|
||||
? call.callerDisplayName
|
||||
: call.callerId,
|
||||
avatarUrl: call.callerAvatarUrl,
|
||||
radius: 56,
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Caller name
|
||||
@@ -106,10 +122,7 @@ class _IncomingCallOverlay extends ConsumerWidget {
|
||||
icon: Icons.call_end,
|
||||
label: 'Decline',
|
||||
colour: Colors.red,
|
||||
onTap: () {
|
||||
// Dismiss the overlay by navigating away; the repository
|
||||
// stream will emit null on the next event cycle.
|
||||
},
|
||||
onTap: () => setState(() => _dismissed = true),
|
||||
),
|
||||
_CallActionButton(
|
||||
icon: call.isVideo ? Icons.videocam : Icons.call,
|
||||
@@ -131,39 +144,6 @@ class _IncomingCallOverlay extends ConsumerWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _CallerAvatar extends StatelessWidget {
|
||||
const _CallerAvatar({required this.call});
|
||||
|
||||
final IncomingCall call;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final initials = call.callerDisplayName.isNotEmpty
|
||||
? call.callerDisplayName[0].toUpperCase()
|
||||
: '?';
|
||||
|
||||
if (call.callerAvatarUrl != null) {
|
||||
return CircleAvatar(
|
||||
radius: 56,
|
||||
backgroundImage: CachedNetworkImageProvider(call.callerAvatarUrl!),
|
||||
);
|
||||
}
|
||||
|
||||
return CircleAvatar(
|
||||
radius: 56,
|
||||
backgroundColor: Theme.of(context).colorScheme.primary.withAlpha(77),
|
||||
child: Text(
|
||||
initials,
|
||||
style: const TextStyle(
|
||||
fontSize: 40,
|
||||
color: Colors.white,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _CallActionButton extends StatelessWidget {
|
||||
const _CallActionButton({
|
||||
required this.icon,
|
||||
|
||||
Reference in New Issue
Block a user