From 92bdb1fa147c572623432a3f174c66e579714eef Mon Sep 17 00:00:00 2001
From: Gius95 <giuseppescorrano95@gmail.com>
Date: Thu, 3 Jan 2019 18:32:30 +0100
Subject: [PATCH] Fix load dei dati post-login

---
 .../integry/integrywmsnative/MainActivity.java |  2 ++
 .../integrywmsnative/SplashActivity.java       | 12 +++++++++++-
 .../gest/login/viewmodel/LoginViewModel.java   | 18 +++++++++++++++---
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index efd31b11..b8fd7208 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -236,6 +236,8 @@ public class MainActivity extends AppCompatActivity
 //                    new SpannableString("Trovato adattatore " + BarcodeManager.getCurrentBarcodeInterface().getAdapterName() + " installato nel sistema"),
 //                    null, null).show();
         }
+        //Preload done in splashPage
+        onDBLoaded();
 
         ServerStatusChecker.getIstance().addCallback(value -> {
             if(value && (!mIsOnline || firstCheckExecution)){
diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
index 4b6f7e69..4e27e4c4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.PermissionsHelper;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
@@ -63,10 +64,19 @@ public class SplashActivity extends AppCompatActivity {
         if(SettingsManager.i().user.username == null && SettingsManager.i().user.password == null){
             startLoginActivity();
         } else {
-            startMainActivity();
+            initFirstData(this::startMainActivity);
         }
     }
 
+    private void initFirstData(Runnable onComplete) {
+
+        SettingsManager.reloadDBVariables(onComplete, ex -> {
+            DialogSimpleMessageHelper.makeErrorDialog(this,
+                    new SpannableString(ex.getMessage()), null, null).show();
+            }
+        );
+    }
+
 
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
index 4ce1974e..1e04530a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java
@@ -19,6 +19,7 @@ import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.di.BindableString;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.core.utility.UtilityServer;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.login.core.LoginHelper;
@@ -235,10 +236,21 @@ public class LoginViewModel {
 
         SettingsManager.update();
 
-        mActivity.finish();
+        ProgressDialog loadingProgress = UtilityProgress.createDefaultProgressDialog(mActivity);
+        SettingsManager.reloadDBVariables(() -> {
+            loadingProgress.dismiss();
+                mActivity.finish();
 
-        Intent myIntent = new Intent(mActivity, MainActivity.class);
-        mActivity.startActivity(myIntent);
+                Intent myIntent = new Intent(mActivity, MainActivity.class);
+                mActivity.startActivity(myIntent);
+
+            },ex -> {
+            loadingProgress.dismiss();
+                DialogSimpleMessageHelper.makeErrorDialog(mActivity,
+                    new SpannableString(ex.getMessage()), null, null).show();
+            }
+        );
     }
 
+
 }