Query initial dataset for Fragment instantiation

Florianisme · Jan 31, 2022 · d429b97 · d429b97
1 parent 862c829
commit d429b97
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/src/main/java/de/florianisme/wakeonlan/home/list/DeviceListAdapter.java b/app/src/main/java/de/florianisme/wakeonlan/home/list/DeviceListAdapter.java
@@ -23,16 +23,21 @@ public class DeviceListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private final DeviceClickedCallback deviceClickedCallback;
     private List<Device> devices = new ArrayList<>();
 
-    public DeviceListAdapter(DeviceClickedCallback deviceClickedCallback) {
+    public DeviceListAdapter(List<Device> initialDataset, DeviceClickedCallback deviceClickedCallback) {
+        updateDevicesList(initialDataset);
         this.deviceClickedCallback = deviceClickedCallback;
     }
 
     public void updateDataset(List<Device> updatedDevices) {
         DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DeviceDiffCallback(updatedDevices, this.devices));
-        this.devices = Collections.unmodifiableList(updatedDevices);
+        updateDevicesList(updatedDevices);
         diffResult.dispatchUpdatesTo(this);
     }
 
+    private void updateDevicesList(List<Device> updatedDevices) {
+        this.devices = Collections.unmodifiableList(updatedDevices);
+    }
+
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {

diff --git a/app/src/main/java/de/florianisme/wakeonlan/home/list/DeviceListFragment.java b/app/src/main/java/de/florianisme/wakeonlan/home/list/DeviceListFragment.java
@@ -13,9 +13,12 @@
 
 import com.google.android.material.snackbar.Snackbar;
 
+import java.util.List;
+
 import de.florianisme.wakeonlan.R;
 import de.florianisme.wakeonlan.databinding.FragmentListDevicesBinding;
 import de.florianisme.wakeonlan.persistence.DatabaseInstanceManager;
+import de.florianisme.wakeonlan.persistence.entities.Device;
 import de.florianisme.wakeonlan.wear.WearClient;
 
 
@@ -55,7 +58,8 @@ private void registerLiveDataObserver() {
     }
 
     private void instantiateRecyclerView() {
-        deviceListAdapter = new DeviceListAdapter(buildDeviceClickedCallback());
+        List<Device> initialDataset = DatabaseInstanceManager.getInstance(getContext()).deviceDao().getAll();
+        deviceListAdapter = new DeviceListAdapter(initialDataset, buildDeviceClickedCallback());
         deviceListAdapter.setHasStableIds(true);
         RecyclerView devicesRecyclerView = binding.machineList;