sort loaded entries, fixes #1163

segler-alex · Sep 28, 2023 · 48ac2d4 · 48ac2d4
1 parent a0f78c3
commit 48ac2d4
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/app/src/main/java/net/programmierecke/radiodroid2/StationSaveManager.java b/app/src/main/java/net/programmierecke/radiodroid2/StationSaveManager.java
@@ -527,14 +527,22 @@ List<DataRadioStation> LoadM3UReader(Reader reader) {
             br.close();
 
             List<DataRadioStation> listStationsNew = Utils.getStationsByUuid(httpClient, context, listUuids);
-            if (listStationsNew != null) {
-                return listStationsNew;
+
+            // sort list to have the same order as the initial save file
+            List<DataRadioStation> listStationsSorted = new ArrayList<DataRadioStation>();
+            for (String uuid: listUuids)
+            {
+                for (DataRadioStation s: listStationsNew){
+                    if (uuid.equals(s.StationUuid)){
+                        listStationsSorted.add(s);
+                        break;
+                    }
+                }
             }
+            return listStationsSorted;
         } catch (Exception e) {
             Log.e("LOAD", "File read failed: " + e.toString());
             return null;
         }
-        List<DataRadioStation> loadedItems = new ArrayList<>();
-        return loadedItems;
     }
 }