Merge pull request #1819 from ardriveapp/dev

PE-6561: Release ArDrive v2.50.1

android/fastlane/metadata/android/en-US/changelogs/144.txt

@@ -0,0 +1,2 @@
+- Show thumbnail checkbox only when images are present in uploads.
+- Fixed issue with saving advanced settings.

lib/blocs/upload/upload_cubit.dart

@@ -16,6 +16,7 @@ import 'package:ardrive/services/config/config.dart';
 import 'package:ardrive/services/config/config_service.dart';
 import 'package:ardrive/services/license/license.dart';
 import 'package:ardrive/turbo/services/upload_service.dart';
+import 'package:ardrive/utils/constants.dart';
 import 'package:ardrive/utils/logger.dart';
 import 'package:ardrive/utils/plausible_event_tracker/plausible_custom_event_properties.dart';
 import 'package:ardrive/utils/plausible_event_tracker/plausible_event_tracker.dart';
@@ -430,6 +431,17 @@ class UploadCubit extends Cubit<UploadState> {
         return;
       }
 
+      final containsSupportedImageTypeForThumbnailGeneration = files.any(
+        (element) => supportedImageTypesInFilePreview.contains(
+          element.ioFile.contentType,
+        ),
+      );
+
+      // if there are no files that can be used to generate a thumbnail, we disable the option
+      if (!containsSupportedImageTypeForThumbnailGeneration) {
+        _uploadThumbnail = false;
+      }
+
       emit(
         UploadReadyToPrepare(
           params: UploadParams(
@@ -439,6 +451,8 @@ class UploadCubit extends Cubit<UploadState> {
             targetDrive: _targetDrive,
             conflictingFiles: conflictingFiles,
             foldersByPath: foldersByPath,
+            containsSupportedImageTypeForThumbnailGeneration:
+                containsSupportedImageTypeForThumbnailGeneration,
           ),
           isArConnect: await _profileCubit.isCurrentProfileArConnect(),
         ),

lib/components/create_manifest_form.dart

@@ -478,6 +478,9 @@ class _CreateManifestFormState extends State<CreateManifestForm> {
                             targetDrive: state.drive,
                             targetFolder: state.parentFolder,
                             user: context.read<ArDriveAuth>().currentUser,
+                            // Theres no thumbnail generation for manifests
+                            containsSupportedImageTypeForThumbnailGeneration:
+                                false,
                           ),
                         ),
                       ),

lib/components/upload_form.dart

@@ -480,36 +480,38 @@ class _UploadFormState extends State<UploadForm> {
                           },
                         ),
                       ),
-                      Padding(
-                        padding: const EdgeInsets.symmetric(vertical: 16),
-                        child: Row(
-                          children: [
-                            ArDriveCheckBox(
-                              title: 'Upload with thumbnails',
-                              checked: context
-                                  .read<ConfigService>()
-                                  .config
-                                  .uploadThumbnails,
-                              titleStyle: typography.paragraphLarge(
-                                fontWeight: ArFontWeight.semiBold,
-                              ),
-                              onChange: (value) {
-                                context
-                                    .read<UploadCubit>()
-                                    .changeUploadThumbnailOption(value);
-                              },
-                            ),
-                            Padding(
-                              padding: const EdgeInsets.only(left: 8.0),
-                              child: ArDriveIconButton(
-                                icon: ArDriveIcons.info(),
-                                tooltip:
-                                    'Uploading with thumbnails is free, but may make your upload take longer.\nYou can always attach a thumbnail later.',
+                      if (state.params
+                          .containsSupportedImageTypeForThumbnailGeneration)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                          child: Row(
+                            children: [
+                              ArDriveCheckBox(
+                                title: 'Upload with thumbnails',
+                                checked: context
+                                    .read<ConfigService>()
+                                    .config
+                                    .uploadThumbnails,
+                                titleStyle: typography.paragraphLarge(
+                                  fontWeight: ArFontWeight.semiBold,
+                                ),
+                                onChange: (value) {
+                                  context
+                                      .read<UploadCubit>()
+                                      .changeUploadThumbnailOption(value);
+                                },
                               ),
-                            )
-                          ],
+                              Padding(
+                                padding: const EdgeInsets.only(left: 8.0),
+                                child: ArDriveIconButton(
+                                  icon: ArDriveIcons.info(),
+                                  tooltip:
+                                      'Uploading with thumbnails is free, but may make your upload take longer.\nYou can always attach a thumbnail later.',
+                                ),
+                              )
+                            ],
+                          ),
                         ),
-                      ),
                       SizedBox(
                         child: ReactiveForm(
                           formGroup:

lib/core/upload/uploader.dart

@@ -625,6 +625,7 @@ class UploadParams {
   final Drive targetDrive;
   final Map<String, String> conflictingFiles;
   final Map<String, WebFolder> foldersByPath;
+  final bool containsSupportedImageTypeForThumbnailGeneration;
 
   UploadParams({
     required this.user,
@@ -633,5 +634,6 @@ class UploadParams {
     required this.targetDrive,
     required this.conflictingFiles,
     required this.foldersByPath,
+    required this.containsSupportedImageTypeForThumbnailGeneration,
   });
 }

lib/services/config/config_fetcher.dart

@@ -13,11 +13,7 @@ class ConfigFetcher {
   ConfigFetcher({required this.localStore});
 
   Future<AppConfig> fetchConfig(Flavor flavor) async {
-    if (flavor == Flavor.production) {
-      return loadFromEnv('prod');
-    } else {
-      return loadFromDevToolsPrefs(flavor);
-    }
+    return loadFromLocalSettings(flavor);
   }
 
   @visibleForTesting
@@ -34,7 +30,7 @@ class ConfigFetcher {
   }
 
   @visibleForTesting
-  Future<AppConfig> loadFromDevToolsPrefs(Flavor flavor) async {
+  Future<AppConfig> loadFromLocalSettings(Flavor flavor) async {
     try {
       final config = localStore.getString('config');
 

pubspec.yaml

@@ -3,7 +3,7 @@ description: Secure, permanent storage
 
 publish_to: 'none'
 
-version: 2.50.0
+version: 2.50.1
 
 environment:
   sdk: '>=3.2.0 <4.0.0'

test/blocs/upload_cubit_test.dart

@@ -135,6 +135,7 @@ void main() {
       targetDrive: getFakeDrive(),
       conflictingFiles: {},
       foldersByPath: {},
+      containsSupportedImageTypeForThumbnailGeneration: false,
     ));
 
     tWalletAddress = await tWallet.getAddress();

test/core/upload/uploader_test.dart

@@ -780,6 +780,7 @@ void main() {
         targetDrive: getFakeDrive(),
         conflictingFiles: {},
         foldersByPath: {},
+        containsSupportedImageTypeForThumbnailGeneration: false,
       ));
       registerFallbackValue(getFakeFolder());
       registerFallbackValue(getFakeDrive());
@@ -796,6 +797,7 @@ void main() {
         targetDrive: getFakeDrive(),
         conflictingFiles: {},
         foldersByPath: {},
+        containsSupportedImageTypeForThumbnailGeneration: false,
       );
       uploadPreparer = UploadPreparer(uploadPlanUtils: uploadPlanUtils);
     });
@@ -896,6 +898,7 @@ void main() {
         targetDrive: getFakeDrive(),
         conflictingFiles: {},
         foldersByPath: {},
+        containsSupportedImageTypeForThumbnailGeneration: false,
       ));
     });
 

test/services/config/config_fetcher_test.dart

@@ -33,20 +33,6 @@ void main() {
   )..toJson());
 
   group('fetchConfig', () {
-    test('returns the production config when flavor is production', () async {
-      when(() => localStore.getString('arweaveGatewayUrl'))
-          .thenReturn('gatewayUrl');
-      when(() => localStore.getBool('enableQuickSyncAuthoring'))
-          .thenReturn(true);
-      when(() => assetBundle.loadString('assets/config/prod.json'))
-          .thenAnswer((_) async => '{}');
-
-      final result = await configFetcher.fetchConfig(Flavor.production);
-
-      expect(result, isInstanceOf<AppConfig>());
-      expect(result.defaultArweaveGatewayUrl, equals('gatewayUrl'));
-    });
-
     test('returns the dev config when flavor is dev', () async {
       when(() => localStore.getString('config')).thenReturn(configStringDev);
 
@@ -89,7 +75,7 @@ void main() {
       when(() => localStore.getString('config')).thenReturn(configStringDev);
 
       final result =
-          await configFetcher.loadFromDevToolsPrefs(Flavor.development);
+          await configFetcher.loadFromLocalSettings(Flavor.development);
 
       expect(result, isInstanceOf<AppConfig>());
       expect(result.defaultArweaveGatewayUrl, equals('devGatewayUrl'));
@@ -108,7 +94,7 @@ void main() {
           .thenAnswer((i) => Future.value(true));
 
       final result =
-          await configFetcher.loadFromDevToolsPrefs(Flavor.development);
+          await configFetcher.loadFromLocalSettings(Flavor.development);
 
       expect(result, isInstanceOf<AppConfig>());
       expect(result.defaultArweaveGatewayUrl, equals('gatewayUrl'));
@@ -129,7 +115,7 @@ void main() {
           .thenAnswer((i) => Future.value(true));
 
       final result =
-          await configFetcher.loadFromDevToolsPrefs(Flavor.development);
+          await configFetcher.loadFromLocalSettings(Flavor.development);
 
       expect(result, isInstanceOf<AppConfig>());
       expect(result.defaultArweaveGatewayUrl, equals('gatewayUrl'));