MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-28 19:45:50 +01:00
Code Releases Wiki Activity

App Manager: Fix cached apps sorting

Browse Source
This commit is contained in:
José Rebelo 2023-06-10 16:13:37 +01:00 committed by José Rebelo
parent 240326c99a
commit 89b23f77b7
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
View File

@ -48,7 +48,10 @@ import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import androidx.core.content.FileProvider; import androidx.core.content.FileProvider;
@ -679,6 +682,30 @@ public abstract class AbstractAppManagerFragment extends Fragment {
GBApplication.deviceService(mGBDevice).onAppDelete(selectedApp.getUUID()); GBApplication.deviceService(mGBDevice).onAppDelete(selectedApp.getUUID());
} }
/**
* Sort an app list by the UUIDs in the sort filename.
*
* @param appList the app list to sort in-place
*/
protected void sortAppList(final List<GBDeviceApp> appList) {
final ArrayList<UUID> uuids = AppManagerActivity.getUuidsFromFile(getSortFilename());
final Map<UUID, Integer> uuidPosMap = new HashMap<>();
for (int i = 0; i < uuids.size(); i++) {
uuidPosMap.put(uuids.get(i), i);
}
Collections.sort(appList, (a1, a2) -> {
final Integer pos1 = uuidPosMap.get(a1.getUUID());
final Integer pos2 = uuidPosMap.get(a2.getUUID());
if (pos1 != null && pos2 != null) return Integer.compare(pos1, pos2);
if (pos1 == null && pos2 == null) return a1.getName().compareToIgnoreCase(a2.getName());
if (pos1 != null) return -1;
return 1;
});
}
@Override @Override
public void onDestroy() { public void onDestroy() {
LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mReceiver); LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mReceiver);

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java
View File

@ -24,7 +24,9 @@ public class AppManagerFragmentCache extends AbstractAppManagerFragment {
@Override @Override
public void refreshList() { public void refreshList() {
appList.clear(); appList.clear();
appList.addAll(getCachedApps(null)); final List<GBDeviceApp> cachedApps = getCachedApps(null);
sortAppList(cachedApps);
appList.addAll(cachedApps);
} }
@Override @Override