@@ -911,8 +911,8 @@ class _EditMessageContentInput extends StatelessWidget {
911
911
///
912
912
/// A convenience class to represent data from the generic file picker,
913
913
/// the media library, and the camera, in a single form.
914
- class _File {
915
- _File ({
914
+ class FileToUpload {
915
+ FileToUpload ({
916
916
required this .content,
917
917
required this .length,
918
918
required this .filename,
@@ -929,14 +929,14 @@ Future<void> _uploadFiles({
929
929
required BuildContext context,
930
930
required ComposeContentController contentController,
931
931
required FocusNode contentFocusNode,
932
- required Iterable <_File > files,
932
+ required Iterable <FileToUpload > files,
933
933
}) async {
934
934
assert (context.mounted);
935
935
final store = PerAccountStoreWidget .of (context);
936
936
final zulipLocalizations = ZulipLocalizations .of (context);
937
937
938
- final List <_File > tooLargeFiles = [];
939
- final List <_File > rightSizeFiles = [];
938
+ final List <FileToUpload > tooLargeFiles = [];
939
+ final List <FileToUpload > rightSizeFiles = [];
940
940
for (final file in files) {
941
941
if ((file.length / (1 << 20 )) > store.maxFileUploadSizeMib) {
942
942
tooLargeFiles.add (file);
@@ -959,7 +959,7 @@ Future<void> _uploadFiles({
959
959
listMessage));
960
960
}
961
961
962
- final List <(int , _File )> uploadsInProgress = [];
962
+ final List <(int , FileToUpload )> uploadsInProgress = [];
963
963
for (final file in rightSizeFiles) {
964
964
final tag = contentController.registerUploadStart (file.filename,
965
965
zulipLocalizations);
@@ -970,7 +970,7 @@ Future<void> _uploadFiles({
970
970
}
971
971
972
972
for (final (tag, file) in uploadsInProgress) {
973
- final _File (: content, : length, : filename, : mimeType) = file;
973
+ final FileToUpload (: content, : length, : filename, : mimeType) = file;
974
974
String ? url;
975
975
try {
976
976
final result = await uploadFile (store.connection,
@@ -1009,7 +1009,7 @@ abstract class _AttachUploadsButton extends StatelessWidget {
1009
1009
///
1010
1010
/// To signal exiting the interaction with no files chosen,
1011
1011
/// return an empty [Iterable] after showing user feedback as appropriate.
1012
- Future <Iterable <_File >> getFiles (BuildContext context);
1012
+ Future <Iterable <FileToUpload >> getFiles (BuildContext context);
1013
1013
1014
1014
void _handlePress (BuildContext context) async {
1015
1015
final files = await getFiles (context);
@@ -1043,7 +1043,7 @@ abstract class _AttachUploadsButton extends StatelessWidget {
1043
1043
}
1044
1044
}
1045
1045
1046
- Future <Iterable <_File >> _getFilePickerFiles (BuildContext context, FileType type) async {
1046
+ Future <Iterable <FileToUpload >> _getFilePickerFiles (BuildContext context, FileType type) async {
1047
1047
FilePickerResult ? result;
1048
1048
try {
1049
1049
result = await ZulipBinding .instance
@@ -1088,7 +1088,7 @@ Future<Iterable<_File>> _getFilePickerFiles(BuildContext context, FileType type)
1088
1088
f.path ?? '' ,
1089
1089
headerBytes: f.bytes? .take (defaultMagicNumbersMaxLength).toList (),
1090
1090
);
1091
- return _File (
1091
+ return FileToUpload (
1092
1092
content: f.readStream! ,
1093
1093
length: f.size,
1094
1094
filename: f.name,
@@ -1108,7 +1108,7 @@ class _AttachFileButton extends _AttachUploadsButton {
1108
1108
zulipLocalizations.composeBoxAttachFilesTooltip;
1109
1109
1110
1110
@override
1111
- Future <Iterable <_File >> getFiles (BuildContext context) async {
1111
+ Future <Iterable <FileToUpload >> getFiles (BuildContext context) async {
1112
1112
return _getFilePickerFiles (context, FileType .any);
1113
1113
}
1114
1114
}
@@ -1124,7 +1124,7 @@ class _AttachMediaButton extends _AttachUploadsButton {
1124
1124
zulipLocalizations.composeBoxAttachMediaTooltip;
1125
1125
1126
1126
@override
1127
- Future <Iterable <_File >> getFiles (BuildContext context) async {
1127
+ Future <Iterable <FileToUpload >> getFiles (BuildContext context) async {
1128
1128
// TODO(#114): This doesn't give quite the right UI on Android.
1129
1129
return _getFilePickerFiles (context, FileType .media);
1130
1130
}
@@ -1141,7 +1141,7 @@ class _AttachFromCameraButton extends _AttachUploadsButton {
1141
1141
zulipLocalizations.composeBoxAttachFromCameraTooltip;
1142
1142
1143
1143
@override
1144
- Future <Iterable <_File >> getFiles (BuildContext context) async {
1144
+ Future <Iterable <FileToUpload >> getFiles (BuildContext context) async {
1145
1145
final zulipLocalizations = ZulipLocalizations .of (context);
1146
1146
final XFile ? result;
1147
1147
try {
@@ -1192,7 +1192,7 @@ class _AttachFromCameraButton extends _AttachUploadsButton {
1192
1192
} catch (e) {
1193
1193
// TODO(log)
1194
1194
}
1195
- return [_File (
1195
+ return [FileToUpload (
1196
1196
content: result.openRead (),
1197
1197
length: length,
1198
1198
filename: result.name,
0 commit comments