[mob] Cast improvements (#1623)

## Description

## Tests
Tested locally

mobile/lib/ui/cast/auto.dart

@@ -79,12 +79,6 @@ class _AutoCastDialogState extends State<AutoCastDialog> {
                       });
                       try {
                         await _connectToYourApp(context, device);
-                        if (mounted) {
-                          setState(() {
-                            _isDeviceTapInProgress.remove(device);
-                          });
-                          Navigator.of(context).pop();
-                        }
                       } catch (e) {
                         if (mounted) {
                           setState(() {
@@ -128,6 +122,11 @@ class _AutoCastDialogState extends State<AutoCastDialog> {
           final code = message[CastMessageType.pairCode]!['code'];
           widget.onConnect(code);
         }
+        if (mounted) {
+          setState(() {
+            _isDeviceTapInProgress.remove(castDevice);
+          });
+        }
       },
     );
   }

mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart

@@ -93,6 +93,8 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
   late bool isInternalUser;
   late GalleryType galleryType;
 
+  final ValueNotifier<int> castNotifier = ValueNotifier<int>(0);
+
   @override
   void initState() {
     super.initState();
@@ -328,14 +330,16 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
         Tooltip(
           message: "Cast album",
           child: IconButton(
-            icon: castService.getActiveSessions().isNotEmpty
-                ? const Icon(Icons.cast_connected_rounded)
-                : const Icon(Icons.cast_outlined),
+            icon: ValueListenableBuilder<int>(
+              valueListenable: castNotifier,
+              builder: (context, value, child) {
+                return castService.getActiveSessions().isNotEmpty
+                    ? const Icon(Icons.cast_connected_rounded)
+                    : const Icon(Icons.cast_outlined);
+              },
+            ),
             onPressed: () async {
               await _castChoiceDialog();
-              if (mounted) {
-                setState(() {});
-              }
             },
           ),
         ),
@@ -728,6 +732,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
           await castService.closeActiveCasts();
         },
       );
+      castNotifier.value++;
       return;
     }
 
@@ -753,6 +758,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
           return AutoCastDialog(
             (device) async {
               await _castPair(bContext, gw, device);
+              Navigator.pop(bContext);
             },
           );
         },
@@ -785,7 +791,10 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
 
   String lastCode = '';
   Future<bool> _castPair(
-      BuildContext bContext, CastGateway gw, String code) async {
+    BuildContext bContext,
+    CastGateway gw,
+    String code,
+  ) async {
     try {
       if (lastCode == code) {
         return false;
@@ -801,15 +810,15 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
       final String castToken = const Uuid().v4().toString();
       final castPayload = CollectionsService.instance
           .getCastData(castToken, widget.collection!, publicKey);
-      _logger.info("Casting album with token $castToken");
       await gw.publishCastPayload(
         code,
         castPayload,
         widget.collection!.id,
         castToken,
       );
-      _logger.info("Casted album with token $castToken");
+      _logger.info("cast album completed");
       // showToast(bContext, S.of(context).pairingComplete);
+      castNotifier.value++;
       return true;
     } catch (e, s) {
       lastCode = '';
@@ -823,6 +832,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
       } else {
         await showGenericErrorDialog(context: bContext, error: e);
       }
+      castNotifier.value++;
       return false;
     }
   }

mobile/plugins/ente_cast_normal/lib/src/service.dart

@@ -24,7 +24,9 @@ class CastServiceImpl extends CastService {
           "got RECEIVER_STATUS, Send request to pair",
           name: "CastServiceImpl",
         );
-        session.sendMessage(_pairRequestNamespace, {});
+        session.sendMessage(_pairRequestNamespace, {
+          "collectionID": collectionID,
+        });
       } else {
         if (onMessage != null && message.containsKey("code")) {
           onMessage(
@@ -32,8 +34,9 @@ class CastServiceImpl extends CastService {
               CastMessageType.pairCode: message,
             },
           );
+        } else {
+          print('receive message: $message');
         }
-        print('receive message: $message');
       }
     });
 
@@ -56,7 +59,9 @@ class CastServiceImpl extends CastService {
 
   @override
   Future<List<(String, Object)>> searchDevices() {
-    return CastDiscoveryService().search().then((devices) {
+    return CastDiscoveryService()
+        .search(timeout: const Duration(seconds: 7))
+        .then((devices) {
       return devices.map((device) => (device.name, device)).toList();
     });
   }