Merge pull request #2189 from bitfriend/activate-integration-test

[smallfix] Miscellaneous fixes

app/lib/common/providers/common_providers.dart

@@ -120,12 +120,8 @@ final emailAddressesProvider = FutureProvider((ref) async {
   ref.watch(genericUpdatesStream('global.acter.dev.three_pid'));
   final confirmed = asDartStringList(await account.confirmedEmailAddresses());
   final requested = asDartStringList(await account.requestedEmailAddresses());
-  final List<String> unconfirmed = [];
-  for (var i = 0; i < requested.length; i++) {
-    if (!confirmed.contains(requested[i])) {
-      unconfirmed.add(requested[i]);
-    }
-  }
+  final unconfirmed =
+      requested.where((email) => !confirmed.contains(email)).toList();
   return EmailAddresses(confirmed, unconfirmed);
 });
 

app/lib/common/providers/room_providers.dart

@@ -45,21 +45,19 @@ final maybeRoomProvider =
 final roomVisibilityProvider = FutureProvider.family
     .autoDispose<RoomVisibility?, String>((ref, roomId) async {
   final room = await ref.watch(maybeRoomProvider(roomId).future);
-  if (room == null) {
-    return null;
-  }
+  if (room == null) return null;
   final joinRule = room.joinRuleStr();
-  switch (joinRule) {
-    case 'public':
-      return RoomVisibility.Public;
-    case 'restricted':
-      return RoomVisibility.SpaceVisible;
-    case 'invite':
-      return RoomVisibility.Private;
-    default:
-      _log.warning('Unsupported joinRule for $roomId: $joinRule');
-      throw 'Unsupported joinRule $joinRule';
+  final visibility = switch (joinRule) {
+    'public' => RoomVisibility.Public,
+    'restricted' => RoomVisibility.SpaceVisible,
+    'invite' => RoomVisibility.Private,
+    _ => null,
+  };
+  if (visibility == null) {
+    _log.warning('Unsupported joinRule for $roomId: $joinRule');
+    throw 'Unsupported joinRule $joinRule';
   }
+  return visibility;
 });
 
 /// Get the members invited of a given roomId the user knows about. Errors
@@ -134,18 +132,12 @@ final parentIdsProvider =
   try {
     // FIXME: we should get only the parent Ids from the underlying SDK
     final relations = await ref.watch(spaceRelationsProvider(roomId).future);
-    if (relations == null) {
-      return [];
-    }
-
+    if (relations == null) return [];
     // Collect all parents: mainParent and otherParents
-    List<String> allParents = [];
-    final mainParent = relations.mainParent();
-    if (mainParent != null) {
-      allParents.add(mainParent.roomId().toString());
-    }
-    allParents
-        .addAll(relations.otherParents().map((p) => p.roomId().toString()));
+    List<String> allParents =
+        relations.mainParent().let((p0) => [p0.roomId().toString()]) ?? [];
+    final others = relations.otherParents().map((p) => p.roomId().toString());
+    allParents.addAll(others);
     return allParents;
   } catch (e) {
     _log.warning('Failed to load parent ids for $roomId: $e');
@@ -157,9 +149,7 @@ final parentIdsProvider =
 final roomDisplayNameProvider =
     FutureProvider.family<String?, String>((ref, roomId) async {
   final room = await ref.watch(maybeRoomProvider(roomId).future);
-  if (room == null) {
-    return null;
-  }
+  if (room == null) return null;
   return (await room.displayName()).text();
 });
 
@@ -169,10 +159,7 @@ final roomAvatarProvider =
   final sdk = await ref.watch(sdkProvider.future);
   final thumbsize = sdk.api.newThumbSize(48, 48);
   final room = await ref.watch(maybeRoomProvider(roomId).future);
-  if (room == null || !room.hasAvatar()) {
-    return null;
-  }
-
+  if (room == null || !room.hasAvatar()) return null;
   final avatar = (await room.avatar(thumbsize)).data();
   if (avatar != null) {
     return MemoryImage(Uint8List.fromList(avatar.asTypedList()));
@@ -197,9 +184,7 @@ final parentAvatarInfosProvider =
 final joinRulesAllowedRoomsProvider = FutureProvider.autoDispose
     .family<List<String>, String>((ref, roomId) async {
   final room = await ref.watch(maybeRoomProvider(roomId).future);
-  if (room == null) {
-    return [];
-  }
+  if (room == null) return [];
   return room.restrictedRoomIdsStr().map((e) => e.toDartString()).toList();
 });
 
@@ -208,9 +193,7 @@ final joinRulesAllowedRoomsProvider = FutureProvider.autoDispose
 final roomMembershipProvider = FutureProvider.family<Member?, String>(
   (ref, roomId) async {
     final room = await ref.watch(maybeRoomProvider(roomId).future);
-    if (room == null || !room.isJoined()) {
-      return null;
-    }
+    if (room == null || !room.isJoined()) return null;
     return await room.getMyMembership();
   },
 );
@@ -219,20 +202,16 @@ final roomMembershipProvider = FutureProvider.family<Member?, String>(
 final roomNotificationStatusProvider =
     FutureProvider.autoDispose.family<String?, String>((ref, roomId) async {
   final room = await ref.watch(maybeRoomProvider(roomId).future);
-  if (room == null) {
-    return null;
-  }
-  return room.notificationMode();
+  if (room == null) return null;
+  return await room.notificationMode();
 });
 
 /// Get the default RoomNotificationsStatus for this room type
 final roomDefaultNotificationStatusProvider =
     FutureProvider.autoDispose.family<String?, String>((ref, roomId) async {
   final room = await ref.watch(maybeRoomProvider(roomId).future);
-  if (room == null) {
-    return null;
-  }
-  return room.defaultNotificationMode();
+  if (room == null) return null;
+  return await room.defaultNotificationMode();
 });
 
 /// Get the default RoomNotificationsStatus for this room type
@@ -266,10 +245,8 @@ final membershipStatusStr =
 final memberDisplayNameProvider =
     FutureProvider.autoDispose.family<String?, MemberInfo>((ref, query) async {
   try {
-    return ref
-        .watch(_memberProfileProvider(query))
-        .valueOrNull
-        ?.displayName();
+    final profile = ref.watch(_memberProfileProvider(query)).valueOrNull;
+    return profile?.displayName();
   } on RoomNotFound {
     return null;
   }
@@ -311,9 +288,7 @@ final memberAvatarInfoProvider =
 final membersIdsProvider =
     FutureProvider.family<List<String>, String>((ref, roomIdOrAlias) async {
   final room = await ref.watch(maybeRoomProvider(roomIdOrAlias).future);
-  if (room == null) {
-    return [];
-  }
+  if (room == null) return [];
   final members = await room.activeMembersIds();
   return asDartStringList(members);
 });

app/lib/common/providers/space_providers.dart

@@ -50,10 +50,8 @@ final otherSpacesForInviteMembersProvider = FutureProvider.autoDispose
 final spaceProvider =
     FutureProvider.family<Space, String>((ref, spaceId) async {
   final maybeSpace = await ref.watch(maybeSpaceProvider(spaceId).future);
-  if (maybeSpace != null) {
-    return maybeSpace;
-  }
-  throw 'Space not found';
+  if (maybeSpace == null) throw 'Space not found';
+  return maybeSpace;
 });
 
 final spaceIsBookmarkedProvider =
@@ -74,9 +72,7 @@ final maybeSpaceProvider =
 final maybeSpaceInfoProvider =
     FutureProvider.autoDispose.family<SpaceItem?, String>((ref, spaceId) async {
   final space = await ref.watch(maybeSpaceProvider(spaceId).future);
-  if (space == null || !space.isJoined()) {
-    return null;
-  }
+  if (space == null || !space.isJoined()) return null;
   final avatarInfo = ref.watch(roomAvatarInfoProvider(spaceId));
   final membership = await space.getMyMembership();
   return SpaceItem(
@@ -95,9 +91,7 @@ final selectedSpaceIdProvider =
 /// gives current context space details based on id, will throw null if id is null
 final selectedSpaceDetailsProvider = Provider.autoDispose<SpaceItem?>((ref) {
   final selectedSpaceId = ref.watch(selectedSpaceIdProvider);
-  if (selectedSpaceId == null) {
-    return null;
-  }
+  if (selectedSpaceId == null) return null;
   return ref.watch(briefSpaceItemProvider(selectedSpaceId));
 });
 
@@ -145,9 +139,7 @@ final hasSpaceWithPermissionProvider =
   final spaces = ref.watch(spacesProvider);
   for (final element in spaces) {
     final membership = await element.getMyMembership();
-    if (membership.canString(permission)) {
-      return true;
-    }
+    if (membership.canString(permission)) return true;
   }
   // none found
   return false;
@@ -164,9 +156,8 @@ final _spaceIdAndNames =
   List<_SpaceIdAndName> items = [];
   for (final space in spaces) {
     final roomId = space.getRoomIdStr();
-    items.add(
-      (roomId, await ref.watch(roomDisplayNameProvider(roomId).future)),
-    );
+    final dispName = await ref.watch(roomDisplayNameProvider(roomId).future);
+    items.add((roomId, dispName));
   }
   return items;
 });
@@ -224,9 +215,7 @@ final briefSpaceItemProvider =
 final spaceInvitedMembersProvider = FutureProvider.autoDispose
     .family<List<Member>, String>((ref, roomIdOrAlias) async {
   final space = await ref.watch(spaceProvider(roomIdOrAlias).future);
-  if (!space.isJoined()) {
-    return [];
-  }
+  if (!space.isJoined()) return [];
   final members = await space.invitedMembers();
   return members.toList();
 });
@@ -237,27 +226,23 @@ final spaceInvitedMembersProvider = FutureProvider.autoDispose
 final spaceRelationsOverviewProvider =
     FutureProvider.family<SpaceRelationsOverview, String>((ref, spaceId) async {
   final relatedSpaces = await ref.watch(spaceRelationsProvider(spaceId).future);
-  if (relatedSpaces == null) {
-    throw SpaceNotFound;
-  }
+  if (relatedSpaces == null) throw SpaceNotFound;
   bool hasMore = false;
   final List<String> knownSubspaces = [];
   final List<String> knownChats = [];
   final List<String> suggested = [];
   for (final related in relatedSpaces.children()) {
-    String targetType = related.targetType();
     final roomId = related.roomId().toString();
-    if (related.suggested()) {
-      suggested.add(roomId);
-    }
+    if (related.suggested()) suggested.add(roomId);
+
     final room = ref.watch(maybeRoomProvider(roomId)).valueOrNull;
     if (room == null || !room.isJoined()) {
       // we don’t know this room or are not in it
       hasMore = true;
       continue;
     }
 
-    if (targetType == 'ChatRoom') {
+    if (related.targetType() == 'ChatRoom') {
       // we know this as a chat room
       knownChats.add(roomId);
     } else {
@@ -324,9 +309,7 @@ final spaceRemoteRelationsProvider =
     FutureProvider.family<List<SpaceHierarchyRoomInfo>, String>(
         (ref, spaceId) async {
   final relatedSpaces = await ref.watch(spaceRelationsProvider(spaceId).future);
-  if (relatedSpaces == null) {
-    return [];
-  }
+  if (relatedSpaces == null) return [];
   return (await relatedSpaces.queryHierarchy()).toList();
 });
 
@@ -367,10 +350,12 @@ final suggestedChatsProvider =
         await ref.watch(spaceRemoteRelationsProvider(spaceId).future);
     // filter out the known rooms
     final remoteRooms = roomHierarchy
-        .where((r) =>
-            !r.isSpace() &&
-            suggestedRooms.contains(r.roomIdStr()) &&
-            !toIgnore.contains(r.roomIdStr()),)
+        .where(
+          (r) =>
+              !r.isSpace() &&
+              suggestedRooms.contains(r.roomIdStr()) &&
+              !toIgnore.contains(r.roomIdStr()),
+        )
         .toList();
     return (localRooms, remoteRooms);
   } on SpaceNotFound {
@@ -395,10 +380,12 @@ final suggestedSpacesProvider =
         await ref.watch(spaceRemoteRelationsProvider(spaceId).future);
     // filter out the known rooms
     final remoteRooms = roomHierarchy
-        .where((r) =>
-            r.isSpace() &&
-            suggestedRooms.contains(r.roomIdStr()) &&
-            !toIgnore.contains(r.roomIdStr()),)
+        .where(
+          (r) =>
+              r.isSpace() &&
+              suggestedRooms.contains(r.roomIdStr()) &&
+              !toIgnore.contains(r.roomIdStr()),
+        )
         .toList();
     return (localRooms, remoteRooms);
   } on SpaceNotFound {

app/lib/common/themes/app_theme.dart

@@ -1,7 +1,8 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/foundation.dart' show kIsWeb;
 import 'dart:io';
 
+import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:flutter/material.dart';
+
 @pragma('vm:platform-const')
 bool isDesktop = (Platform.isLinux || Platform.isWindows || Platform.isMacOS);
 @pragma('vm:platform-const')
@@ -13,18 +14,13 @@ final usesNotoEmoji = !(Platform.isWindows ||
 const defaultEmojiFont = 'NotoEmoji';
 
 String? selectEmojiFont() {
-  switch (Platform.operatingSystem) {
-    case 'ios':
-    case 'macos':
-      return 'Apple Color Emoji';
-    case 'windows':
-      return 'Segoe UI Emoji';
-    case 'linux':
-      return defaultEmojiFont;
+  return switch (Platform.operatingSystem) {
+    'ios' || 'macos' => 'Apple Color Emoji',
+    'windows' => 'Segoe UI Emoji',
+    'linux' => defaultEmojiFont,
     // we fallback to system supported emoji otherwise
-    default:
-      return null;
-  }
+    _ => null,
+  };
 }
 
 final emojiFont = selectEmojiFont();

app/lib/common/utils/utils.dart

@@ -183,24 +183,14 @@ String getHumanReadableFileSize(int bytes) {
 }
 
 String documentTypeFromFileExtension(String fileExtension) {
-  switch (fileExtension) {
-    case '.png':
-    case '.jpg':
-    case '.jpeg':
-      return 'Image';
-    case '.mov':
-    case '.mp4':
-      return 'Video';
-    case '.mp3':
-    case '.wav':
-      return 'Audio';
-    case '.pdf':
-      return 'PDF';
-    case '.txt':
-      return 'Text File';
-    default:
-      return '';
-  }
+  return switch (fileExtension) {
+    '.png' || '.jpg' || '.jpeg' => 'Image',
+    '.mov' || '.mp4' => 'Video',
+    '.mp3' || '.wav' => 'Audio',
+    '.pdf' => 'PDF',
+    '.txt' => 'Text File',
+    _ => '',
+  };
 }
 
 Future<void> shareTextToWhatsApp(
@@ -269,8 +259,9 @@ Future<void> uploadAvatar(
   try {
     if (!context.mounted) return;
     EasyLoading.show(status: L10n.of(context).avatarUploading);
-    final file = result.files.first;
-    if (file.path != null) await room.uploadAvatar(file.path!);
+    final filePath = result.files.first.path;
+    if (filePath == null) throw 'avatar path not available';
+    await room.uploadAvatar(filePath);
     // close loading
     EasyLoading.dismiss();
   } catch (e, s) {