Fixed profile restore issue

brodeurlv · Jul 10, 2020 · 888cdb5 · 888cdb5
1 parent 8d3b738
commit 888cdb5
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/app/src/main/java/com/easyfitness/MainActivity.java b/app/src/main/java/com/easyfitness/MainActivity.java
@@ -258,6 +258,15 @@ public void onCreate(Bundle savedInstanceState) {
 
         loadPreferences();
 
+        profileViMo = new ViewModelProvider(this).get(ProfileViMo.class);
+        profileViMo.getProfile().observe(this, profile -> {
+            // Update UI
+            setDrawerTitle(profile.getName());
+            setPhotoProfile(profile.getPhoto());
+            mCurrentProfilID = profile.getId();
+            savePreferences();
+        });
+
         DatabaseHelper.renameOldDatabase(this);
 
         if (DatabaseHelper.DATABASE_VERSION >= 15 && !mMigrationBD15done) {
@@ -344,13 +353,7 @@ public void onCreate(Bundle savedInstanceState) {
             startActivityForResult(intent, REQUEST_CODE_INTRO);
         }
 
-        profileViMo = new ViewModelProvider(this).get(ProfileViMo.class);
-        profileViMo.getProfile().observe(this, profile -> {
-            // Update UI
-            setDrawerTitle(profile.getName());
-            setPhotoProfile(profile.getPhoto());
-            savePreferences();
-        });
+
     }
 
     @Override
@@ -756,7 +759,6 @@ public void setCurrentProfil(String newProfilName) {
 
     public void setCurrentProfil(Profile newProfil) {
         profileViMo.setProfile(newProfil);
-
     }
 
     private void setPhotoProfile(String path) {
@@ -807,7 +809,7 @@ private void savePreferences() {
         // Restore preferences
         SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
         SharedPreferences.Editor editor = settings.edit();
-        if (profileViMo!=null && profileViMo.getProfile().getValue()!=null) editor.putLong("currentProfil", profileViMo.getProfile().getValue().getId());
+        editor.putLong("currentProfil", mCurrentProfilID);
         editor.putBoolean("intro014Launched", mIntro014Launched);
         editor.putBoolean("migrationBD15done", mMigrationBD15done);
         editor.apply();