feat: Use matrix authenticated media
This commit is contained in:
parent
f17b09f56c
commit
158a6855c3
7 changed files with 134 additions and 115 deletions
53
lib/utils/client_download_content_extension.dart
Normal file
53
lib/utils/client_download_content_extension.dart
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
import 'dart:typed_data';
|
||||
|
||||
import 'package:matrix/matrix.dart';
|
||||
|
||||
extension ClientDownloadContentExtension on Client {
|
||||
Future<Uint8List> downloadMxcCached(
|
||||
Uri mxc, {
|
||||
num? width,
|
||||
num? height,
|
||||
bool isThumbnail = false,
|
||||
bool? animated,
|
||||
ThumbnailMethod? thumbnailMethod,
|
||||
}) async {
|
||||
// To stay compatible with previous storeKeys:
|
||||
final cacheKey = isThumbnail
|
||||
// ignore: deprecated_member_use
|
||||
? mxc.getThumbnail(
|
||||
this,
|
||||
width: width,
|
||||
height: height,
|
||||
animated: animated,
|
||||
method: thumbnailMethod!,
|
||||
)
|
||||
: mxc;
|
||||
|
||||
final cachedData = await database?.getFile(cacheKey);
|
||||
if (cachedData != null) return cachedData;
|
||||
|
||||
final httpUri = isThumbnail
|
||||
? await mxc.getThumbnailUri(
|
||||
this,
|
||||
width: width,
|
||||
height: height,
|
||||
animated: animated,
|
||||
method: thumbnailMethod,
|
||||
)
|
||||
: await mxc.getDownloadUri(this);
|
||||
|
||||
final response = await httpClient.get(
|
||||
httpUri,
|
||||
headers:
|
||||
accessToken == null ? null : {'authorization': 'Bearer $accessToken'},
|
||||
);
|
||||
if (response.statusCode != 200) {
|
||||
throw Exception();
|
||||
}
|
||||
final remoteData = response.bodyBytes;
|
||||
|
||||
await database?.storeFile(cacheKey, remoteData, 0);
|
||||
|
||||
return remoteData;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
import 'dart:io';
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
|
||||
import 'package:flutter_shortcuts/flutter_shortcuts.dart';
|
||||
|
|
@ -13,6 +11,7 @@ import 'package:matrix/matrix.dart';
|
|||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
import 'package:fluffychat/config/app_config.dart';
|
||||
import 'package:fluffychat/utils/client_download_content_extension.dart';
|
||||
import 'package:fluffychat/utils/client_manager.dart';
|
||||
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
|
||||
import 'package:fluffychat/utils/platform_infos.dart';
|
||||
|
|
@ -177,28 +176,25 @@ Future<void> _tryPushHelper(
|
|||
);
|
||||
|
||||
// The person object for the android message style notification
|
||||
final avatar = event.room.avatar
|
||||
?.getThumbnail(
|
||||
client,
|
||||
width: 256,
|
||||
height: 256,
|
||||
)
|
||||
.toString();
|
||||
final avatar = event.room.avatar;
|
||||
final senderAvatar = event.room.isDirectChat
|
||||
? avatar
|
||||
: event.senderFromMemoryOrFallback.avatarUrl
|
||||
?.getThumbnail(
|
||||
client,
|
||||
width: 256,
|
||||
height: 256,
|
||||
)
|
||||
.toString();
|
||||
: event.senderFromMemoryOrFallback.avatarUrl;
|
||||
|
||||
File? roomAvatarFile, senderAvatarFile;
|
||||
Uint8List? roomAvatarFile, senderAvatarFile;
|
||||
try {
|
||||
roomAvatarFile = avatar == null
|
||||
? null
|
||||
: await DefaultCacheManager().getSingleFile(avatar);
|
||||
: await client
|
||||
.downloadMxcCached(
|
||||
avatar,
|
||||
thumbnailMethod: ThumbnailMethod.scale,
|
||||
width: 256,
|
||||
height: 256,
|
||||
animated: false,
|
||||
isThumbnail: true,
|
||||
)
|
||||
.timeout(const Duration(seconds: 3));
|
||||
} catch (e, s) {
|
||||
Logs().e('Unable to get avatar picture', e, s);
|
||||
}
|
||||
|
|
@ -207,7 +203,16 @@ Future<void> _tryPushHelper(
|
|||
? roomAvatarFile
|
||||
: senderAvatar == null
|
||||
? null
|
||||
: await DefaultCacheManager().getSingleFile(senderAvatar);
|
||||
: await client
|
||||
.downloadMxcCached(
|
||||
senderAvatar,
|
||||
thumbnailMethod: ThumbnailMethod.scale,
|
||||
width: 256,
|
||||
height: 256,
|
||||
animated: false,
|
||||
isThumbnail: true,
|
||||
)
|
||||
.timeout(const Duration(seconds: 3));
|
||||
} catch (e, s) {
|
||||
Logs().e('Unable to get avatar picture', e, s);
|
||||
}
|
||||
|
|
@ -225,7 +230,7 @@ Future<void> _tryPushHelper(
|
|||
name: event.senderFromMemoryOrFallback.calcDisplayname(),
|
||||
icon: senderAvatarFile == null
|
||||
? null
|
||||
: BitmapFilePathAndroidIcon(senderAvatarFile.path),
|
||||
: ByteArrayAndroidIcon(senderAvatarFile),
|
||||
),
|
||||
);
|
||||
|
||||
|
|
@ -272,7 +277,7 @@ Future<void> _tryPushHelper(
|
|||
name: event.senderFromMemoryOrFallback.calcDisplayname(),
|
||||
icon: roomAvatarFile == null
|
||||
? null
|
||||
: BitmapFilePathAndroidIcon(roomAvatarFile.path),
|
||||
: ByteArrayAndroidIcon(roomAvatarFile),
|
||||
key: event.roomId,
|
||||
important: event.room.isFavourite,
|
||||
),
|
||||
|
|
@ -321,7 +326,7 @@ Future<void> _setShortcut(
|
|||
Event event,
|
||||
L10n l10n,
|
||||
String title,
|
||||
File? avatarFile,
|
||||
Uint8List? avatarFile,
|
||||
) async {
|
||||
final flutterShortcuts = FlutterShortcuts();
|
||||
await flutterShortcuts.initialize(debug: !kReleaseMode);
|
||||
|
|
@ -333,8 +338,7 @@ Future<void> _setShortcut(
|
|||
conversationShortcut: true,
|
||||
icon: avatarFile == null
|
||||
? null
|
||||
: ShortcutMemoryIcon(jpegImage: await avatarFile.readAsBytes())
|
||||
.toString(),
|
||||
: ShortcutMemoryIcon(jpegImage: avatarFile).toString(),
|
||||
shortcutIconAsset: avatarFile == null
|
||||
? ShortcutIconAsset.androidAsset
|
||||
: ShortcutIconAsset.memoryAsset,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue