From 7bf99ebd07115b791489fac0a251a8e213c9df7c Mon Sep 17 00:00:00 2001
From: Elias Projahn <johrpan@gmail.com>
Date: Sun, 3 May 2020 22:45:28 +0200
Subject: [PATCH] mobile: Fix reconnection to playback service

---
 mobile/lib/player.dart | 60 ++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/mobile/lib/player.dart b/mobile/lib/player.dart
index 0aaceb9..48987b6 100644
--- a/mobile/lib/player.dart
+++ b/mobile/lib/player.dart
@@ -109,36 +109,40 @@ class Player {
 
   /// Connect listeners and initialize streams.
   void setup() {
-    if (_playbackServiceStateSubscription == null) {
-      // We will receive updated state information from the playback service,
-      // which runs in its own isolate, through this port.
-      final receivePort = ReceivePort();
-      receivePort.asBroadcastStream(
-        onListen: (subscription) {
-          _playbackServiceStateSubscription = subscription;
-        },
-      ).listen((msg) {
-        // If state is null, the background audio service has stopped.
-        if (msg == null) {
-          _stop();
-        } else {
-          if (msg is _StatusMessage) {
-            playing.add(msg.playing);
-          } else if (msg is _PositionMessage) {
-            _updatePosition(msg.positionMs);
-          } else if (msg is _TrackMessage) {
-            _updateCurrentTrack(msg.currentTrack);
-            _updateDuration(msg.positionMs, msg.durationMs);
-          } else if (msg is _PlaylistMessage) {
-            playlist.add(msg.playlist);
-            _updateCurrentTrack(msg.currentTrack);
-            _updateDuration(msg.positionMs, msg.durationMs);
-          }
-        }
-      });
-      IsolateNameServer.registerPortWithName(receivePort.sendPort, _portName);
+    if (_playbackServiceStateSubscription != null) {
+      _playbackServiceStateSubscription.cancel();
     }
 
+    // We will receive updated state information from the playback service,
+    // which runs in its own isolate, through this port.
+    final receivePort = ReceivePort();
+    receivePort.asBroadcastStream(
+      onListen: (subscription) {
+        _playbackServiceStateSubscription = subscription;
+      },
+    ).listen((msg) {
+      // If state is null, the background audio service has stopped.
+      if (msg == null) {
+        _stop();
+      } else {
+        if (msg is _StatusMessage) {
+          playing.add(msg.playing);
+        } else if (msg is _PositionMessage) {
+          _updatePosition(msg.positionMs);
+        } else if (msg is _TrackMessage) {
+          _updateCurrentTrack(msg.currentTrack);
+          _updateDuration(msg.positionMs, msg.durationMs);
+        } else if (msg is _PlaylistMessage) {
+          playlist.add(msg.playlist);
+          _updateCurrentTrack(msg.currentTrack);
+          _updateDuration(msg.positionMs, msg.durationMs);
+        }
+      }
+    });
+    
+    IsolateNameServer.removePortNameMapping(_portName);
+    IsolateNameServer.registerPortWithName(receivePort.sendPort, _portName);
+
     if (AudioService.running) {
       active.add(true);