2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Use correct own person for android notification replies

Browse source
This commit is contained in:
Christian Kußowski 2026-03-05 09:09:27 +01:00
commit c206a51515
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
2 changed files with 34 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

75
lib/utils/push_helper.dart
View file

@ -162,43 +162,15 @@ Future<void> _tryPushHelper(
? avatar
: event.senderFromMemoryOrFallback.avatarUrl;
Uint8List? roomAvatarFile, senderAvatarFile;
try {
roomAvatarFile = avatar == null
? null
: await client
.downloadMxcCached(
avatar,
thumbnailMethod: ThumbnailMethod.crop,
width: notificationAvatarDimension,
height: notificationAvatarDimension,
animated: false,
isThumbnail: true,
rounded: true,
)
.timeout(const Duration(seconds: 3));
} catch (e, s) {
Logs().e('Unable to get avatar picture', e, s);
}
try {
senderAvatarFile = event.room.isDirectChat
? roomAvatarFile
: senderAvatar == null
? null
: await client
.downloadMxcCached(
senderAvatar,
thumbnailMethod: ThumbnailMethod.crop,
width: notificationAvatarDimension,
height: notificationAvatarDimension,
animated: false,
isThumbnail: true,
rounded: true,
)
.timeout(const Duration(seconds: 3));
} catch (e, s) {
Logs().e('Unable to get avatar picture', e, s);
}
final ownUser = event.room.unsafeGetUserFromMemoryOrFallback(client.userID!);
final userAvatarFile = await client.tryDownloadNotificationAvatar(
ownUser.avatarUrl,
);
final roomAvatarFile = await client.tryDownloadNotificationAvatar(avatar);
final senderAvatarFile = await client.tryDownloadNotificationAvatar(
senderAvatar,
);
final id = notification.roomId.hashCode;
@ -262,12 +234,11 @@ Future<void> _tryPushHelper(
messagingStyleInformation ??
MessagingStyleInformation(
Person(
name: senderName,
icon: roomAvatarFile == null
name: ownUser.calcDisplayname(),
icon: userAvatarFile == null
? null
: ByteArrayAndroidIcon(roomAvatarFile),
key: event.roomId,
important: event.room.isFavourite,
: ByteArrayAndroidIcon(userAvatarFile),
key: event.room.client.userID,
),
conversationTitle: event.room.isDirectChat ? null : roomName,
groupConversation: !event.room.isDirectChat,
@ -372,3 +343,23 @@ Future<void> _setShortcut(
),
);
}
extension on Client {
Future<Uint8List?> tryDownloadNotificationAvatar(Uri? avatar) async {
if (avatar == null) return null;
try {
return await downloadMxcCached(
avatar,
thumbnailMethod: ThumbnailMethod.crop,
width: notificationAvatarDimension,
height: notificationAvatarDimension,
animated: false,
isThumbnail: true,
rounded: true,
).timeout(const Duration(seconds: 3));
} catch (e, s) {
Logs().e('Unable to get avatar picture', e, s);
return null;
}
}
}