Fix issue report screenshot size validation

Author: atavism

lib/features/report_issue/models/report_issue_attachment_rules.dart

@@ -57,9 +57,8 @@ class ReportIssueAttachmentRulesUtils {
   }
 
   static String? validateAttachments(
-    Iterable<ReportIssueAttachment> attachments, {
-    int reservedBytes = 0,
-  }) {
+    Iterable<ReportIssueAttachment> attachments,
+  ) {
     final items = attachments.toList(growable: false);
     if (items.length > maxCount) {
       return tooManyAttachmentsMessage;
@@ -71,7 +70,7 @@ class ReportIssueAttachmentRulesUtils {
       }
     }
 
-    if (reservedBytes + totalBytes(items) > maxTotalBytes) {
+    if (totalBytes(items) > maxTotalBytes) {
       return totalSizeExceededMessage;
     }
 

lib/features/report_issue/provider/attachment_budget.dart

@@ -112,10 +112,7 @@ class ReportIssueDraft extends _$ReportIssueDraft {
     state = state.copyWith(description: value);
   }
 
-  void addAttachments(
-    Iterable<ReportIssueAttachment> attachments, {
-    int reservedBytes = 0,
-  }) {
+  void addAttachments(Iterable<ReportIssueAttachment> attachments) {
     final incoming = attachments.toList(growable: false);
     if (incoming.isEmpty) {
       return;
@@ -142,7 +139,6 @@ class ReportIssueDraft extends _$ReportIssueDraft {
 
     final validationError = ReportIssueAttachmentRulesUtils.validateAttachments(
       nextAttachments,
-      reservedBytes: reservedBytes,
     );
     if (validationError != null) {
       state = state.copyWith(attachmentError: validationError);

lib/features/report_issue/provider/report_issue_draft_notifier.dart

@@ -7,15 +7,14 @@ import 'package:lantern/core/utils/device_utils.dart';
 import 'package:lantern/features/report_issue/models/report_issue_attachment.dart';
 import 'package:lantern/features/report_issue/models/report_issue_attachment_rules.dart';
 import 'package:lantern/features/report_issue/provider/attachment_access.dart';
-import 'package:lantern/features/report_issue/provider/attachment_budget.dart';
+import 'package:lantern/features/report_issue/provider/log_file_resolver.dart';
 import 'package:lantern/lantern/lantern_service.dart';
 import 'package:lantern/lantern/lantern_service_notifier.dart';
 
 final reportIssueSubmitterProvider = Provider<ReportIssueSubmitter>(
   (ref) => ReportIssueSubmitter(
     ref.read(lanternServiceProvider),
     attachmentAccess: ref.read(reportIssueAttachmentAccessProvider),
-    attachmentBudget: ref.read(reportIssueAttachmentBudgetProvider),
   ),
 );
 
@@ -25,21 +24,17 @@ class ReportIssueSubmitter {
   final LanternService _lanternService;
   final ReportIssueDeviceInfoLoader _deviceInfoLoader;
   final ReportIssueAttachmentAccess _attachmentAccess;
-  final ReportIssueAttachmentBudget _attachmentBudget;
   final ReportIssueLogFileResolver _logFileResolver;
 
   ReportIssueSubmitter(
     LanternService lanternService, {
     ReportIssueDeviceInfoLoader? deviceInfoLoader,
     ReportIssueAttachmentAccess? attachmentAccess,
-    ReportIssueAttachmentBudget? attachmentBudget,
     ReportIssueLogFileResolver? logFileResolver,
   }) : _lanternService = lanternService,
        _deviceInfoLoader = deviceInfoLoader ?? DeviceUtils.getDeviceAndModel,
        _attachmentAccess =
            attachmentAccess ?? PlatformReportIssueAttachmentAccess(),
-       _attachmentBudget =
-           attachmentBudget ?? PlatformReportIssueAttachmentBudget(),
        _logFileResolver = logFileResolver ?? defaultReportIssueLogFileResolver;
 
   Future<Either<Failure, Unit>> submit({
@@ -48,10 +43,8 @@ class ReportIssueSubmitter {
     required String description,
     required List<ReportIssueAttachment> attachments,
   }) async {
-    final reservedBytes = await _attachmentBudget.reservedBytes();
     final validationError = ReportIssueAttachmentRulesUtils.validateAttachments(
       attachments,
-      reservedBytes: reservedBytes,
     );
     if (validationError != null) {
       return Left(

lib/features/report_issue/provider/submitter.dart

@@ -8,7 +8,6 @@ import 'package:lantern/features/report_issue/models/report_issue_attachment.dar
 import 'package:lantern/features/report_issue/models/report_issue_attachment_rules.dart';
 import 'package:lantern/features/report_issue/provider/report_issue_draft_notifier.dart';
 import 'package:lantern/features/report_issue/provider/attachment_picker.dart';
-import 'package:lantern/features/report_issue/provider/attachment_budget.dart';
 import 'package:lantern/features/report_issue/provider/submitter.dart';
 import 'package:lantern/features/report_issue/widgets/report_issue_attachment_dropzone.dart';
 import 'package:lantern/core/widgets/card_dropdown.dart';
@@ -255,17 +254,11 @@ class _ReportIssueState extends ConsumerState<ReportIssue> {
       return;
     }
 
-    final reservedBytes = await ref
-        .read(reportIssueAttachmentBudgetProvider)
-        .reservedBytes();
-
     if (!mounted) {
       return;
     }
 
-    ref
-        .read(reportIssueDraftProvider.notifier)
-        .addAttachments(attachments, reservedBytes: reservedBytes);
+    ref.read(reportIssueDraftProvider.notifier).addAttachments(attachments);
   }
 
   void _clearDraft() {

lib/features/report_issue/report_issue.dart

@@ -6,7 +6,6 @@ import 'package:lantern/core/utils/failure.dart';
 import 'package:lantern/features/report_issue/models/report_issue_attachment.dart';
 import 'package:lantern/features/report_issue/models/report_issue_attachment_rules.dart';
 import 'package:lantern/features/report_issue/provider/attachment_access.dart';
-import 'package:lantern/features/report_issue/provider/attachment_budget.dart';
 import 'package:lantern/features/report_issue/provider/submitter.dart';
 import 'package:lantern/lantern/lantern_service.dart';
 
@@ -44,15 +43,6 @@ class _FakeLanternService implements LanternService {
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
-class _FakeAttachmentBudget implements ReportIssueAttachmentBudget {
-  int value;
-
-  _FakeAttachmentBudget({this.value = 0});
-
-  @override
-  Future<int> reservedBytes() async => value;
-}
-
 class _FakeAttachmentAccess implements ReportIssueAttachmentAccess {
   bool wasUsed = false;
   Object? error;
@@ -74,7 +64,6 @@ void main() {
   group('ReportIssueSubmitter', () {
     test('forwards attachments through to LanternService', () async {
       final fakeService = _FakeLanternService();
-      final attachmentBudget = _FakeAttachmentBudget();
       final attachmentAccess = _FakeAttachmentAccess();
       const attachment = ReportIssueAttachment(
         name: 'vpn_error.png',
@@ -91,7 +80,6 @@ void main() {
       final submitter = ReportIssueSubmitter(
         fakeService,
         attachmentAccess: attachmentAccess,
-        attachmentBudget: attachmentBudget,
         deviceInfoLoader: () async => ('macOS', 'MacBook Pro'),
         logFileResolver: () async => logFile,
       );
@@ -118,11 +106,9 @@ void main() {
 
     test('rejects oversize totals before calling LanternService', () async {
       final fakeService = _FakeLanternService();
-      final attachmentBudget = _FakeAttachmentBudget(value: 1024);
 
       final submitter = ReportIssueSubmitter(
         fakeService,
-        attachmentBudget: attachmentBudget,
         deviceInfoLoader: () async => ('iOS', 'iPhone'),
         logFileResolver: () async => null,
       );
@@ -136,7 +122,7 @@ void main() {
             name: 'huge.png',
             path: '/tmp/huge.png',
             mimeType: 'image/png',
-            sizeBytes: ReportIssueAttachmentRulesUtils.maxTotalBytes,
+            sizeBytes: ReportIssueAttachmentRulesUtils.maxTotalBytes + 1,
           ),
         ],
       );
@@ -164,7 +150,6 @@ void main() {
         final submitter = ReportIssueSubmitter(
           fakeService,
           attachmentAccess: attachmentAccess,
-          attachmentBudget: _FakeAttachmentBudget(),
           deviceInfoLoader: () async => ('macOS', 'MacBook Pro'),
           logFileResolver: () async => null,
         );
@@ -201,7 +186,6 @@ void main() {
       final fakeService = _FakeLanternService();
       final submitter = ReportIssueSubmitter(
         fakeService,
-        attachmentBudget: _FakeAttachmentBudget(),
         deviceInfoLoader: () async => ('Windows', 'Surface'),
         logFileResolver: () async => null,
       );