Merge pull request #1917 from ardriveapp/fix-attach-drives

fix(attach drives)
ardriveapp · Nov 18, 2024 · d2f596a · d2f596a
2 parents 656eb02 + 4681e2d
commit d2f596a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/blocs/drive_detail/drive_detail_cubit.dart b/lib/blocs/drive_detail/drive_detail_cubit.dart
@@ -138,12 +138,21 @@ class DriveDetailCubit extends Cubit<DriveDetailState> {
       _folderSubscription =
           Rx.combineLatest3<Drive?, FolderWithContents, ProfileState, void>(
         _driveRepository.watchDrive(driveId: driveId),
-        _driveDao.watchFolderContents(
+        _driveDao
+            .watchFolderContents(
           driveId,
           orderBy: contentOrderBy,
           orderingMode: contentOrderingMode,
           folderId: folderId,
-        ),
+        )
+            .handleError((error, stack) {
+          logger.e('Error watching folder contents', error, stack);
+          if (error is DriveNotFoundException) {
+            emit(DriveDetailLoadNotFound());
+          }
+
+          return null;
+        }),
         _profileCubit.stream.startWith(ProfileCheckingAvailability()),
         (drive, folderContents, _) async {
           if (isClosed) {

diff --git a/lib/pages/drive_detail/drive_detail_page.dart b/lib/pages/drive_detail/drive_detail_page.dart
@@ -132,7 +132,8 @@ class _DriveDetailPageState extends State<DriveDetailPage> {
         child: BlocListener<DrivesCubit, DrivesState>(
           listener: (context, state) {
             if (state is DrivesLoadSuccess) {
-              if (state.userDrives.isNotEmpty) {
+              if (state.userDrives.isNotEmpty ||
+                  state.sharedDrives.isNotEmpty) {
                 final driveDetailState = context.read<DriveDetailCubit>().state;
 
                 if (driveDetailState is DriveDetailLoadSuccess &&