Merge branch 'dev' into PE-6222-add-health-check-option-on-dev-tools-…

…panel

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

@@ -0,0 +1 @@
+- Enhanced upload logging for better error insights and improved retry mechanism

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

@@ -0,0 +1,2 @@
+- Improves handling of a few common errors
+- Enhances empty drive and folder view

lib/blocs/drives/drives_cubit.dart

@@ -132,6 +132,10 @@ class DrivesCubit extends Cubit<DrivesState> {
         drivesWithAlerts: const [],
         canCreateNewDrive: false);
 
+    if (isClosed) {
+      return;
+    }
+
     emit(state);
   }
 

lib/blocs/upload/upload_cubit.dart

@@ -607,11 +607,18 @@ class UploadCubit extends Cubit<UploadState> {
     );
 
     uploadController.onError((tasks) {
-      logger.e('Error uploading folders. Number of tasks: ${tasks.length}');
-      addError(Exception('Error uploading'));
+      logger.i('Error uploading folders. Number of tasks: ${tasks.length}');
+      emit(UploadFailure(
+          error: UploadErrors.unknown,
+          failedTasks: tasks,
+          controller: uploadController));
       hasEmittedError = true;
     });
 
+    uploadController.onFailedTask((task) {
+      logger.e('UploadTask failed. Task: ${task.errorInfo()}', task.error);
+    });
+
     uploadController.onProgressChange(
       (progress) {
         emit(
@@ -651,8 +658,6 @@ class UploadCubit extends Cubit<UploadState> {
 
   void retryUploads() {
     if (state is UploadFailure) {
-      logger.i('Retrying uploads');
-
       final controller = (state as UploadFailure).controller!;
 
       controller.retryFailedTasks(_auth.currentUser.wallet);
@@ -722,7 +727,7 @@ class UploadCubit extends Cubit<UploadState> {
     );
 
     uploadController.onError((tasks) {
-      logger.e('Error uploading files. Number of tasks: ${tasks.length}');
+      logger.i('Error uploading files. Number of tasks: ${tasks.length}');
       hasEmittedError = true;
       emit(
         UploadFailure(
@@ -733,10 +738,13 @@ class UploadCubit extends Cubit<UploadState> {
       );
     });
 
+    uploadController.onFailedTask((task) {
+      logger.e('UploadTask failed. Task: ${task.errorInfo()}', task.error);
+    });
+
     uploadController.onProgressChange(
       (progress) async {
         // TODO: Save as the file is finished the upload
-
         emit(
           UploadInProgressUsingNewUploader(
             progress: progress,
@@ -961,7 +969,6 @@ class UploadCubit extends Cubit<UploadState> {
     }
 
     emit(UploadFailure(error: UploadErrors.unknown));
-    logger.e('Failed to upload file', error, stackTrace);
     super.onError(error, stackTrace);
   }
 

lib/components/folder_create_form.dart

@@ -76,6 +76,7 @@ class _FolderCreateFormState extends State<FolderCreateForm> {
             showProgressDialog(
               context,
               title: appLocalizationsOf(context).creatingFolderEmphasized,
+              useNewArDriveUI: true,
             );
           } else if (state is FolderCreateSuccess) {
             Navigator.pop(context);
@@ -91,14 +92,15 @@ class _FolderCreateFormState extends State<FolderCreateForm> {
               description: appLocalizationsOf(context).entityAlreadyExists(
                 state.folderName,
               ),
+              useNewArDriveUI: true,
             );
           }
         },
-        builder: (context, state) => ArDriveStandardModal(
+        builder: (context, state) => ArDriveStandardModalNew(
           title: appLocalizationsOf(context).createFolderEmphasized,
           content: SizedBox(
             width: kMediumDialogWidth,
-            child: ArDriveTextField(
+            child: ArDriveTextFieldNew(
               controller: _folderNameController,
               autofocus: true,
               onFieldSubmitted: (value) {

lib/components/pin_file_dialog.dart

@@ -100,14 +100,14 @@ class PinFileDialog extends StatelessWidget {
         final idValidationError = _getIdValidationError(context, state);
         final nameValidationError = _getNameValidationError(context, state);
 
-        return ArDriveStandardModal(
+        return ArDriveStandardModalNew(
           title: appLocalizationsOf(context).newFilePin,
           content: SizedBox(
             width: kMediumDialogWidth,
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                ArDriveTextField(
+                ArDriveTextFieldNew(
                   isEnabled: state is! PinFileNetworkCheckRunning,
                   label: appLocalizationsOf(context).enterTxIdOrFileId,
                   isFieldRequired: true,
@@ -119,7 +119,7 @@ class PinFileDialog extends StatelessWidget {
                     );
                   },
                 ),
-                ArDriveTextField(
+                ArDriveTextFieldNew(
                   isEnabled: true,
                   label: appLocalizationsOf(context).enterFileName,
                   isFieldRequired: true,
@@ -154,10 +154,6 @@ class PinFileDialog extends StatelessWidget {
   }
 
   String? _getIdValidationError(BuildContext context, PinFileState state) {
-    // if (state is PinFileInitial) {
-    //   return null;
-    // }
-
     if (state.idValidation == IdValidationResult.invalid) {
       return appLocalizationsOf(context).theIdProvidedIsNotValid;
     } else if (state.idValidation == IdValidationResult.required) {
@@ -183,10 +179,6 @@ class PinFileDialog extends StatelessWidget {
   }
 
   String? _getNameValidationError(BuildContext context, PinFileState state) {
-    // if (state is PinFileInitial) {
-    //   return null;
-    // }
-
     if (state.nameValidation == NameValidationResult.invalid) {
       return appLocalizationsOf(context).validationInvalid;
     } else if (state.nameValidation == NameValidationResult.required) {
@@ -197,21 +189,22 @@ class PinFileDialog extends StatelessWidget {
     return null;
   }
 
-  ArDriveStandardModal _errorDialog(
+  ArDriveStandardModalNew _errorDialog(
     BuildContext context, {
     required String errorText,
     bool doublePop = false,
   }) =>
-      ArDriveStandardModal(
+      ArDriveStandardModalNew(
         width: kMediumDialogWidth,
         title: appLocalizationsOf(context).failedToCreatePin,
         content: Column(
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            const SizedBox(height: 16),
-            Text(errorText),
-            const SizedBox(height: 16),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 16),
+              child: Text(errorText),
+            ),
           ],
         ),
         actions: [

lib/components/progress_dialog.dart

@@ -8,13 +8,15 @@ Future<void> showProgressDialog(
   BuildContext context, {
   required String title,
   List<ModalAction>? actions,
+  bool useNewArDriveUI = false,
 }) =>
     showArDriveDialog(
       context,
       barrierDismissible: false,
       content: ProgressDialog(
         title: title,
         actions: actions ?? const [],
+        useNewArDriveUI: useNewArDriveUI,
       ),
     );
 

lib/components/upload_form.dart

@@ -746,7 +746,6 @@ class _UploadFormState extends State<UploadForm> {
                 ],
               );
             } else if (state is UploadFailure) {
-              logger.e('Upload failed: ${state.error}');
               if (state.error == UploadErrors.turboTimeout) {
                 return ArDriveStandardModal(
                   title: appLocalizationsOf(context).uploadFailed,

lib/core/crypto/crypto.dart

@@ -92,7 +92,10 @@ class ArDriveCrypto {
       final cipherIvTag = transaction.getTag(EntityTag.cipherIv);
 
       if (cipher == null || cipherIvTag == null) {
-        throw MissingCipherTagException();
+        throw MissingCipherTagException(
+          corruptedDataAppVersion: transaction.getTag(EntityTag.appVersion),
+          corruptedTransactionId: transaction.id,
+        );
       }
 
       final cipherIv = utils.decodeBase64ToBytes(cipherIvTag);
@@ -128,6 +131,7 @@ class ArDriveCrypto {
       } else {
         throw UnknownCipherException(
           corruptedDataAppVersion: transaction.getTag(EntityTag.appVersion),
+          corruptedTransactionId: transaction.id,
         );
       }
 
@@ -143,6 +147,7 @@ class ArDriveCrypto {
       /// Unknow error
       throw TransactionDecryptionException(
         corruptedDataAppVersion: transaction.getTag(EntityTag.appVersion),
+        corruptedTransactionId: transaction.id,
       );
     }
   }
@@ -161,6 +166,7 @@ class ArDriveCrypto {
     if (cipher == null || cipherIvTag == null) {
       throw MissingCipherTagException(
         corruptedDataAppVersion: transaction.getTag(EntityTag.appVersion),
+        corruptedTransactionId: transaction.id,
       );
     }