PE-6480: Release Ardrive v2.49.5

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

@@ -0,0 +1 @@
+- Improves handling of a few common errors

lib/authentication/login/blocs/login_bloc.dart

@@ -5,6 +5,7 @@ import 'package:ardrive/authentication/ardrive_auth.dart';
 import 'package:ardrive/authentication/login/blocs/ethereum_signer.dart';
 import 'package:ardrive/authentication/login/blocs/stub_web_wallet.dart' // stub implementation
     if (dart.library.html) 'package:ardrive/authentication/login/blocs/web_wallet.dart';
+import 'package:ardrive/blocs/profile/profile_cubit.dart';
 import 'package:ardrive/core/crypto/crypto.dart';
 import 'package:ardrive/core/download_service.dart';
 import 'package:ardrive/entities/profile_types.dart';
@@ -40,6 +41,7 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   final ArweaveService _arweaveService;
   final DownloadService _downloadService;
   final ConfigService _configService;
+  final ProfileCubit _profileCubit;
 
   bool ignoreNextWaletSwitch = false;
 
@@ -61,13 +63,15 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
     required DownloadService downloadService,
     required UserRepository userRepository,
     required ConfigService configService,
+    required ProfileCubit profileCubit,
   })  : _arDriveAuth = arDriveAuth,
         _arConnectService = arConnectService,
         _ethereumProviderService = ethereumProviderService,
         _arweaveService = arweaveService,
         _turboUploadService = turboUploadService,
         _downloadService = downloadService,
         _configService = configService,
+        _profileCubit = profileCubit,
         super(LoginLoading()) {
     on<LoginEvent>(_onLoginEvent);
     _listenToWalletChange();
@@ -500,7 +504,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
     Emitter<LoginState> emit,
   ) async {
     if (await _arDriveAuth.isUserLoggedIn()) {
-      await _arDriveAuth.logout();
+      await _arDriveAuth
+          .logout()
+          .then((value) => _profileCubit.logoutProfile());
     }
 
     usingSeedphrase = false;

lib/authentication/login/views/login_page.dart

@@ -72,6 +72,7 @@ class _LoginPageState extends State<LoginPage> {
       arDriveAuth: context.read<ArDriveAuth>(),
       userRepository: context.read<UserRepository>(),
       configService: context.read<ConfigService>(),
+      profileCubit: context.read<ProfileCubit>(),
     )..add(
         CheckIfUserIsLoggedIn(
           gettingStarted: widget.gettingStarted,
@@ -93,6 +94,11 @@ class _LoginPageState extends State<LoginPage> {
             });
           }
 
+          if (loginState is LoginSuccess) {
+            logger.setContext(logger.context
+                .copyWith(userAddress: loginState.user.walletAddress));
+          }
+
           if (loginState is PromptPassword) {
             showEnterYourPasswordDialog(
               context: context,

lib/blocs/drive_attach/drive_attach_cubit.dart

@@ -154,8 +154,8 @@ class DriveAttachCubit extends Cubit<DriveAttachState> {
       PlausibleEventTracker.trackAttachDrive(
         drivePrivacy: drivePrivacy,
       );
-    } catch (err) {
-      addError(err);
+    } catch (err, stacktrace) {
+      _handleError(err, stacktrace);
     }
   }
 
@@ -249,11 +249,9 @@ class DriveAttachCubit extends Cubit<DriveAttachState> {
     return null;
   }
 
-  @override
-  void onError(Object error, StackTrace stackTrace) {
-    emit(DriveAttachFailure());
-    super.onError(error, stackTrace);
+  void _handleError(Object error, StackTrace stackTrace) {
+    logger.e('Failed to attach drive. Emitting error', error, stackTrace);
 
-    logger.e('Failed to attach drive', error, stackTrace);
+    emit(DriveAttachFailure());
   }
 }

lib/blocs/fs_entry_preview/fs_entry_preview_cubit.dart

@@ -32,8 +32,8 @@ class FsEntryPreviewCubit extends Cubit<FsEntryPreviewState> {
   final SecretKey? _fileKey;
 
   StreamSubscription? _entrySubscription;
-  static final ValueNotifier<ImagePreviewNotification> imagePreviewNotifier =
-      ValueNotifier<ImagePreviewNotification>(ImagePreviewNotification());
+  static final ValueNotifier<ImagePreviewNotification?> imagePreviewNotifier =
+      ValueNotifier<ImagePreviewNotification?>(null);
 
   final previewMaxFileSize = 1024 * 1024 * 100;
   final allowedPreviewContentTypes = [];
@@ -180,10 +180,15 @@ class FsEntryPreviewCubit extends Cubit<FsEntryPreviewState> {
     FileEntry file,
     String dataUrl,
   ) async {
+    if (file.dataContentType == null) {
+      emit(FsEntryPreviewUnavailable());
+      return;
+    }
+
     imagePreviewNotifier.value = ImagePreviewNotification(
       isLoading: true,
       filename: file.name,
-      contentType: file.dataContentType,
+      contentType: file.dataContentType!,
     );
 
     emit(FsEntryPreviewImage(previewUrl: dataUrl));
@@ -428,10 +433,16 @@ class FsEntryPreviewCubit extends Cubit<FsEntryPreviewState> {
     if (isClosed) {
       return;
     }
+
+    if (file.dataContentType == null) {
+      emit(FsEntryPreviewUnavailable());
+      return;
+    }
+
     imagePreviewNotifier.value = ImagePreviewNotification(
       dataBytes: dataBytes,
       filename: file.name,
-      contentType: file.dataContentType,
+      contentType: file.dataContentType!,
     );
     emit(FsEntryPreviewImage(previewUrl: dataUrl));
   }

lib/blocs/fs_entry_preview/image_preview_notification.dart

@@ -3,15 +3,15 @@ import 'dart:typed_data';
 class ImagePreviewNotification {
   bool isLoading;
   Uint8List? dataBytes;
-  String? filename;
-  String? contentType;
+  String filename;
+  String contentType;
 
   bool get isPreviewable => dataBytes != null;
 
   ImagePreviewNotification({
     this.dataBytes,
-    this.filename,
-    this.contentType,
+    required this.filename,
+    required this.contentType,
     this.isLoading = false,
   });
 }

lib/blocs/upload/upload_cubit.dart

@@ -440,7 +440,7 @@ class UploadCubit extends Cubit<UploadState> {
       );
     } catch (error, stacktrace) {
       logger.e('error mounting the upload', error, stacktrace);
-      addError(error);
+      _emitError(error);
     }
   }
 
@@ -645,14 +645,6 @@ class UploadCubit extends Cubit<UploadState> {
 
     uploadController.onDone(
       (tasks) async {
-        logger.d('Upload folders and files finished... Verifying results');
-
-        if (tasks.any((element) => element.status == UploadStatus.failed)) {
-          logger.e('One or more tasks failed. Emitting error');
-          // if any of the files failed, we should throw an error
-          addError(Exception('Error uploading'));
-        }
-
         emit(UploadComplete());
 
         unawaited(_profileCubit.refreshBalance());
@@ -766,30 +758,15 @@ class UploadCubit extends Cubit<UploadState> {
 
     uploadController.onDone(
       (tasks) async {
-        logger.d('Upload files finished... Verifying results');
-
-        bool uploadSucced = true;
-
-        if (tasks.any((element) => element.status == UploadStatus.failed)) {
-          logger.e('One or more tasks failed. Emitting error');
-          // if any of the files failed, we should throw an error
-          addError(Exception('Error uploading'));
-
-          PlausibleEventTracker.trackUploadFailure();
-          uploadSucced = false;
-        }
-
         unawaited(_profileCubit.refreshBalance());
 
-        // all files are uploaded
-
-        logger.i('Upload finished with success');
+        logger.i(
+          'Upload finished with success. Number of tasks: ${tasks.length}',
+        );
 
         emit(UploadComplete());
 
-        if (uploadSucced) {
-          PlausibleEventTracker.trackUploadSuccess();
-        }
+        PlausibleEventTracker.trackUploadSuccess();
       },
     );
 
@@ -976,16 +953,14 @@ class UploadCubit extends Cubit<UploadState> {
     emit(UploadFailure(error: UploadErrors.unknown));
   }
 
-  @override
-  void onError(Object error, StackTrace stackTrace) {
+  void _emitError(Object error) {
     if (error is TurboUploadTimeoutException) {
       emit(UploadFailure(error: UploadErrors.turboTimeout));
 
       return;
     }
 
     emit(UploadFailure(error: UploadErrors.unknown));
-    super.onError(error, stackTrace);
   }
 
   Future<void> cancelUpload() async {