Fixed some bugs in the newly implemented feature.

Author: amitamrutiya

lib/Notifications/notification_controller.dart

@@ -35,31 +35,32 @@ class NotificationController {
       await TorrentApi.startTorrent(
           hashes: [homeModel.state.torrentList[receivedAction.id!].hash],
           context: NavigationService.navigatorKey.currentContext!);
-    } else if (actionKey == NotificationConstants.CANCEL_ACTION_KEY) {
+    }
+
+    // Cancel downloads
+    else if (actionKey == NotificationConstants.CANCEL_ACTION_KEY) {
       BlocProvider.of<HomeScreenBloc>(
               NavigationService.navigatorKey.currentContext!,
               listen: false)
-          .add(
-        UpdateNotificationCancelEvent(
-          newNotificationCancel: {
-            homeModel.state.torrentList[receivedAction.id!].hash: true
-          },
-        ),
-      );
-    } else if (actionKey == NotificationConstants.STOP_ACTION_KEY) {
+          .state
+          .notificationCancel
+          .putIfAbsent(
+              homeModel.state.torrentList[receivedAction.id!].hash, () => true);
+    }
+
+    // Stop downloads
+    else if (actionKey == NotificationConstants.STOP_ACTION_KEY) {
       await TorrentApi.stopTorrent(
           hashes: [homeModel.state.torrentList[receivedAction.id!].hash],
           context: NavigationService.navigatorKey.currentContext!);
+
       BlocProvider.of<HomeScreenBloc>(
               NavigationService.navigatorKey.currentContext!,
               listen: false)
-          .add(
-        UpdateNotificationCancelEvent(
-          newNotificationCancel: {
-            homeModel.state.torrentList[receivedAction.id!].hash: true
-          },
-        ),
-      );
+          .state
+          .notificationCancel
+          .putIfAbsent(
+              homeModel.state.torrentList[receivedAction.id!].hash, () => true);
     }
   }
 }

lib/Pages/torrent_screen/services/filtered_torrent_list.dart

@@ -2,6 +2,8 @@ import 'package:flood_mobile/Blocs/filter_torrent_bloc/filter_torrent_bloc.dart'
 import 'package:flood_mobile/Blocs/home_screen_bloc/home_screen_bloc.dart';
 import 'package:flood_mobile/Blocs/sort_by_torrent_bloc/sort_by_torrent_bloc.dart';
 import 'package:flood_mobile/Model/torrent_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 bool isFilteredTorrent(
     TorrentModel torrentModel, FilterTorrentState stateFilterBloc) {
@@ -58,7 +60,8 @@ int countDisplayTorrent(HomeScreenState model, FilterTorrentState filterModel) {
 
 List<TorrentModel> sortTorrents(
     {required List<TorrentModel> torrents,
-    required SortByTorrentState sortState}) {
+    required SortByTorrentState sortState,
+    required BuildContext context}) {
   switch (sortState.sortByStatus) {
     case SortByValue.name:
       torrents.sort((a, b) {
@@ -171,5 +174,7 @@ List<TorrentModel> sortTorrents(
     default:
       throw Exception('Unsupported sort criteria');
   }
+  BlocProvider.of<HomeScreenBloc>(context)
+      .add(SetTorrentListEvent(newTorrentList: torrents));
   return torrents;
 }

lib/Pages/torrent_screen/torrent_screen.dart

@@ -51,9 +51,8 @@ class _TorrentScreenState extends State<TorrentScreen> {
                           builder: (context, sortByState) {
                             List<TorrentModel> torrentList = sortTorrents(
                               torrents: state.torrentList,
-                              sortState:
-                                  BlocProvider.of<SortByTorrentBloc>(context)
-                                      .state,
+                              sortState: sortByState,
+                              context: context,
                             );
                             return BlocBuilder<SpeedGraphBloc, SpeedGraphState>(
                               builder: (context, graphSstate) {