From 921824d93fb590e372a3de8206f837b0a81f7af2 Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Fri, 26 Sep 2025 00:46:04 +0800
Subject: [PATCH] Fix bug

---
 .../java/com/fongmi/android/tv/ui/dialog/CastDialog.java | 9 ++-------
 .../java/com/fongmi/android/tv/utils/DLNADevice.java     | 7 +------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java
index 7774ae599..711db636b 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java
@@ -42,8 +42,6 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 import kotlin.Unit;
 import okhttp3.Call;
@@ -128,10 +126,7 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe
     }
 
     private void getDevice() {
-        List<Device> items = new ArrayList<>();
-        if (fm) items.addAll(Device.getAll());
-        items.addAll(DLNADevice.get().getAll());
-        adapter.setItems(items, () -> {
+        adapter.setItems(Device.getAll(), () -> {
             if (adapter.getItemCount() == 0) onRefresh();
         });
     }
@@ -173,7 +168,7 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe
 
     @Override
     public void onDeviceRemoved(@NonNull org.fourthline.cling.model.meta.Device<?, ?, ?> device) {
-        DLNADevice.get().remove(device);
+        adapter.remove(DLNADevice.get().remove(device));
     }
 
     @Override
diff --git a/app/src/mobile/java/com/fongmi/android/tv/utils/DLNADevice.java b/app/src/mobile/java/com/fongmi/android/tv/utils/DLNADevice.java
index b46fd950b..5057c2d01 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/utils/DLNADevice.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/utils/DLNADevice.java
@@ -4,9 +4,7 @@ import com.android.cast.dlna.dmc.DLNACastManager;
 import com.fongmi.android.tv.bean.Device;
 
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class DLNADevice {
 
@@ -24,10 +22,6 @@ public class DLNADevice {
         this.devices = new LinkedHashSet<>();
     }
 
-    public List<Device> getAll() {
-        return devices.stream().map(Device::get).collect(Collectors.toList());
-    }
-
     public Device add(org.fourthline.cling.model.meta.Device<?, ?, ?> item) {
         devices.add(item);
         return Device.get(item);
@@ -40,6 +34,7 @@ public class DLNADevice {
 
     public void disconnect() {
         devices.forEach(DLNACastManager.INSTANCE::disconnectDevice);
+        devices.clear();
     }
 
     public org.fourthline.cling.model.meta.Device<?, ?, ?> find(Device item) {