From 1b44f3566e0fae9fa65a0a88bc245f13577161d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 14 Jun 2023 21:24:24 +0100
Subject: [PATCH] Prevent UI freeze when a folder has a lot of devices

Do not include the devices from collapsed folders in the array.
---
 .../gadgetbridge/adapter/GBDeviceAdapterv2.java              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 099627e7d..2e71223b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -163,7 +163,9 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
 
         for (final Map.Entry<String, List<GBDevice>> folder : devicesPerFolder.entrySet()) {
             enrichedList.add(new GBDeviceFolder(folder.getKey()));
-            enrichedList.addAll(folder.getValue());
+            if (folder.getKey().equals(expandedFolderName)) {
+                enrichedList.addAll(folder.getValue());
+            }
         }
 
         return enrichedList;
@@ -213,6 +215,7 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
                 }else {
                     expandedFolderName = folder.getName();
                 }
+                rebuildFolders();
                 notifyDataSetChanged();
             }
         });