Improve device sorting (#118)

valterc · Feb 8, 2023 · e10a913 · e10a913
1 parent a8fed5b
commit e10a913
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/app/src/main/java/com/valterc/ki2/fragments/devices/list/ListDevicesFragment.java b/app/src/main/java/com/valterc/ki2/fragments/devices/list/ListDevicesFragment.java
@@ -95,7 +95,17 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             if (service != null) {
                 try {
                     List<DeviceId> devices = viewModel.getSavedDevices();
-                    devices.sort((a, b) -> new DevicePreferences(requireContext(), a).getPriority() - new DevicePreferences(requireContext(), b).getPriority());
+                    devices.sort((a, b) -> {
+                        DevicePreferences devicePreferencesA = new DevicePreferences(requireContext(), a);
+                        DevicePreferences devicePreferencesB = new DevicePreferences(requireContext(), b);
+
+                        int priority = devicePreferencesA.getPriority() - devicePreferencesB.getPriority();
+                        if (priority != 0) {
+                            return priority;
+                        }
+
+                        return devicePreferencesA.getName().compareToIgnoreCase(devicePreferencesB.getName());
+                    });
                     listDevicesAdapter.setDevices(devices);
                     textViewNoSavedDevices.setVisibility(viewModel.anyDevicesSaved() ? View.GONE : View.VISIBLE);
                     viewModel.startReceivingData();

diff --git a/app/src/main/java/com/valterc/ki2/karoo/service/device/DeviceDataRouter.java b/app/src/main/java/com/valterc/ki2/karoo/service/device/DeviceDataRouter.java
@@ -112,7 +112,12 @@ private boolean tryUpdateCurrentDevice() {
                     assert preferencesA != null;
                     assert preferencesB != null;
 
-                    return preferencesA.getPriority(context) - preferencesB.getPriority(context);
+                    int priority = preferencesA.getPriority(context) - preferencesB.getPriority(context);
+                    if (priority != 0) {
+                        return priority;
+                    }
+
+                    return preferencesA.getName(context).compareToIgnoreCase(preferencesB.getName(context));
                 }).collect(Collectors.toList());
 
         for (DeviceData deviceData : sortedDeviceData) {