From 9f40314b86bff72969f25e87a9940bcd0879d062 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 21 Jul 2017 14:28:11 +0200
Subject: [PATCH] improve data loading on startup

---
 .../habitica/ui/activities/MainActivity.java        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index ec1b9b607..62721ff99 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -293,13 +293,8 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria
     protected void onResume() {
         super.onResume();
 
-        //resync, if last sync was more than 10 minutes ago
-        if (this.apiClient != null && this.apiClient.hasAuthenticationKeys()) {
-            retrieveUser();
-            this.checkMaintenance();
-        }
-
-        inventoryRepository.retrieveContent().subscribe(contentResult -> {}, RxErrorHandler.handleEmptyError());
+        retrieveUser();
+        this.checkMaintenance();
 
         if (this.sharedPreferences.getLong("lastReminderSchedule", 0) < new Date().getTime() - 86400000) {
             try {
@@ -792,6 +787,7 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria
     protected void retrieveUser() {
         if (this.userRepository != null) {
             this.userRepository.retrieveUser(true)
+                    .flatMap(user1 -> inventoryRepository.retrieveContent(false))
                     .subscribe(user1 -> {}, RxErrorHandler.handleEmptyError());
         }
     }
@@ -941,8 +937,7 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria
                             }
                         }
                     }
-                }, throwable -> {
-                });
+                }, throwable -> {});
     }
 
     private Intent createMaintenanceIntent(MaintenanceResponse maintenanceResponse, Boolean isDeprecationNotice) {