Nexus/nexus
Nexus/nexus
Watch
4
4
Fork
You've already forked nexus
 5
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity

fix encrypted uploads

Browse source
This commit is contained in:
Henry Hiles 2026-07-21 21:34:49 -04:00
commit 2a91959333
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/controllers/attachment.dart
View file

@ -26,8 +26,7 @@ class AttachmentController extends Notifier<(String, MessageContent?)?> {
.uploadMedia( .uploadMedia(
.new( .new(
path: file.path, path: file.path,
encrypted: encrypt: room?.state[EventType.encryption.type]?.isNotEmpty == true,
room?.state[EventType.encryption.name]?.isNotEmpty == true,
), ),
); );

10
lib/models/content/message.dart
View file

@ -7,6 +7,8 @@ import "package:nexus/models/info/video.dart";
part "message.freezed.dart"; part "message.freezed.dart";
part "message.g.dart"; part "message.g.dart";
typedef EncryptedFile = Map<String, dynamic>;
@Freezed(unionKey: "msgtype", fallbackUnion: "default") @Freezed(unionKey: "msgtype", fallbackUnion: "default")
abstract class MessageContent extends Content with _$MessageContent { abstract class MessageContent extends Content with _$MessageContent {
MessageContent._(); MessageContent._();
@ -38,7 +40,7 @@ abstract class MessageContent extends Content with _$MessageContent {
required String body, required String body,
MessageFormat? format, MessageFormat? format,
String? formattedBody, String? formattedBody,
// EncryptedFile? file EncryptedFile? file,
String? filename, String? filename,
ImageInfo? info, ImageInfo? info,
Uri? url, Uri? url,
@ -49,7 +51,7 @@ abstract class MessageContent extends Content with _$MessageContent {
required String body, required String body,
MessageFormat? format, MessageFormat? format,
String? formattedBody, String? formattedBody,
// EncryptedFile? file EncryptedFile? file,
String? filename, String? filename,
FileInfo? info, FileInfo? info,
Uri? url, Uri? url,
@ -60,7 +62,7 @@ abstract class MessageContent extends Content with _$MessageContent {
required String body, required String body,
MessageFormat? format, MessageFormat? format,
String? formattedBody, String? formattedBody,
// EncryptedFile? file EncryptedFile? file,
String? filename, String? filename,
AudioInfo? info, AudioInfo? info,
Uri? url, Uri? url,
@ -71,7 +73,7 @@ abstract class MessageContent extends Content with _$MessageContent {
required String body, required String body,
MessageFormat? format, MessageFormat? format,
String? formattedBody, String? formattedBody,
// EncryptedFile? file EncryptedFile? file,
String? filename, String? filename,
VideoInfo? info, VideoInfo? info,
Uri? url, Uri? url,

2
lib/models/requests/upload_media.dart
View file

@ -6,7 +6,7 @@ part "upload_media.g.dart";
abstract class UploadMediaRequest with _$UploadMediaRequest { abstract class UploadMediaRequest with _$UploadMediaRequest {
const factory UploadMediaRequest({ const factory UploadMediaRequest({
required String path, required String path,
required bool encrypted, required bool encrypt,
String? filename, String? filename,
@Default(false) @JsonKey(name: "voice_message") bool isVoiceMessage, @Default(false) @JsonKey(name: "voice_message") bool isVoiceMessage,
@Default(false) bool forceFile, @Default(false) bool forceFile,