Fixed: Overview and stock page not populated after theme change or ot…

…her cases (closes #692 and #695)
patzly · May 21, 2023 · 17cfcd2 · 17cfcd2
1 parent fb0d2ad
commit 17cfcd2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/OverviewStartFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/OverviewStartFragment.java
@@ -144,7 +144,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       return false;
     });
 
-    if (savedInstanceState == null) {
+    if (savedInstanceState == null || !viewModel.isAlreadyLoadedFromDatabase()) {
       viewModel.loadFromDatabase(true);
     }
 

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/StockOverviewFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/StockOverviewFragment.java
@@ -282,7 +282,7 @@ public void instantiateUnderlayButton(
 
     hideDisabledFeatures();
 
-    if (savedInstanceState == null) {
+    if (savedInstanceState == null || !viewModel.isAlreadyLoadedFromDatabase()) {
       viewModel.loadFromDatabase(true);
     }
 

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/viewmodel/OverviewStartViewModel.java b/app/src/main/java/xyz/zedler/patrick/grocy/viewmodel/OverviewStartViewModel.java
@@ -101,6 +101,7 @@ public class OverviewStartViewModel extends BaseViewModel {
   private final LiveData<String> masterDataDescriptionTextLive;
   private final MutableLiveData<Integer> currentUserIdLive;
   private List<ShoppingList> shoppingLists;
+  private boolean alreadyLoadedFromDatabase;
   private final boolean debug;
 
   public OverviewStartViewModel(@NonNull Application application) {
@@ -137,6 +138,7 @@ public OverviewStartViewModel(@NonNull Application application) {
     choreEntriesLive = new MutableLiveData<>();
     tasksLive = new MutableLiveData<>();
     currentUserIdLive = new MutableLiveData<>(sharedPrefs.getInt(PREF.CURRENT_USER_ID, 1));
+    alreadyLoadedFromDatabase = false;
 
     stockDescriptionTextLive = new MediatorLiveData<>();
     stockDescriptionTextLive.addSource(
@@ -482,6 +484,7 @@ public void loadFromDatabase(boolean downloadAfterLoading) {
       choresDueSoonCountLive.setValue(choresDueSoonCount);
       choresDueTodayCountLive.setValue(choresDueTodayCount);
 
+      alreadyLoadedFromDatabase = true;
       if (downloadAfterLoading) {
         downloadData(false);
       }
@@ -642,6 +645,10 @@ public MutableLiveData<Boolean> getStoredPurchasesOnDevice() {
     return storedPurchasesOnDevice;
   }
 
+  public boolean isAlreadyLoadedFromDatabase() {
+    return alreadyLoadedFromDatabase;
+  }
+
   public boolean isFeatureEnabled(String pref) {
     if (pref == null) {
       return true;

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/viewmodel/StockOverviewViewModel.java b/app/src/main/java/xyz/zedler/patrick/grocy/viewmodel/StockOverviewViewModel.java
@@ -114,6 +114,7 @@ public class StockOverviewViewModel extends BaseViewModel {
   private ArrayList<String> searchResultsFuzzy;
   private final boolean debug;
   private final int maxDecimalPlacesAmount;
+  private boolean alreadyLoadedFromDatabase;
 
   public StockOverviewViewModel(@NonNull Application application, StockOverviewFragmentArgs args) {
     super(application);
@@ -124,6 +125,7 @@ public StockOverviewViewModel(@NonNull Application application, StockOverviewFra
         STOCK.DECIMAL_PLACES_AMOUNT,
         SETTINGS_DEFAULT.STOCK.DECIMAL_PLACES_AMOUNT
     );
+    alreadyLoadedFromDatabase = false;
 
     isLoadingLive = new MutableLiveData<>(false);
     dlHelper = new DownloadHelper(getApplication(), TAG, isLoadingLive::setValue);
@@ -259,6 +261,7 @@ public void loadFromDatabase(boolean downloadAfterLoading) {
           .setOpenedCount(itemsOpenedCount)
           .emitCounts();
       updateFilteredStockItems();
+      alreadyLoadedFromDatabase = true;
       if (downloadAfterLoading) {
         downloadData(false);
       }
@@ -724,6 +727,10 @@ public void toggleScannerVisibility() {
     scannerVisibilityLive.setValue(!isScannerVisible());
   }
 
+  public boolean isAlreadyLoadedFromDatabase() {
+    return alreadyLoadedFromDatabase;
+  }
+
   @NonNull
   public MutableLiveData<Boolean> getOfflineLive() {
     return offlineLive;

diff --git a/app/src/main/res/raw/changelog.txt b/app/src/main/res/raw/changelog.txt
@@ -3,6 +3,7 @@
 - Fixed: Random crash with no reason (#699)
 - Fixed: Prevent another crash after reopening app from background (#697)
 - Fixed: Product pictures not loading (with Home Assistant or not, we don't know) (#700)
+- Fixed: Overview and stock page not populated after theme change or other cases (#692, #695)
 
 ## 3.2.0