From 9fa6dbf82165e8be3db0c48bbf9acf7bb6d44eee Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 25 May 2017 16:21:31 +0200
Subject: [PATCH] improve content loading

---
 Habitica/AndroidManifest.xml                       |  2 +-
 .../android/habitica/HabiticaBaseApplication.java  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index e836ddf1a..69e5608be 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="185"
+    android:versionCode="190"
     android:versionName="1.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
index c0b3a4fe0..919dc88c2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -24,6 +24,7 @@ import com.facebook.drawee.backends.pipeline.Fresco;
 import com.habitrpg.android.habitica.api.HostConfig;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.helpers.RxErrorHandler;
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.activities.IntroActivity;
@@ -51,7 +52,9 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
     private static AppComponent component;
     public RefWatcher refWatcher;
     @Inject
-    Lazy<ApiClient> lazyApiHelper;
+    ApiClient lazyApiHelper;
+    @Inject
+    InventoryRepository inventoryRepository;
     @Inject
     SharedPreferences sharedPrefs;
     @Inject
@@ -83,7 +86,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         editor.putBoolean("use_reminder", use_reminder);
         editor.putString("reminder_time", reminder_time);
         editor.apply();
-        getInstance(context).lazyApiHelper.get().updateAuthenticationCredentials(null, null);
+        getInstance(context).lazyApiHelper.updateAuthenticationCredentials(null, null);
         startActivity(LoginActivity.class, context);
     }
 
@@ -165,10 +168,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         int lastInstalledVersion = sharedPrefs.getInt("last_installed_version", 0);
         if (lastInstalledVersion < info.versionCode) {
             sharedPrefs.edit().putInt("last_installed_version", info.versionCode).apply();
-            ApiClient apiClient = this.lazyApiHelper.get();
-
-            apiClient.getContent()
-                    .subscribe(contentResult -> { }, RxErrorHandler.handleEmptyError());
+            inventoryRepository.retrieveContent().subscribe(contentResult -> {}, RxErrorHandler.handleEmptyError());
         }
     }
 
@@ -283,7 +283,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
             @NonNull
             @Override
             public PurchaseVerifier getPurchaseVerifier() {
-                return new HabiticaPurchaseVerifier(HabiticaBaseApplication.this, lazyApiHelper.get());
+                return new HabiticaPurchaseVerifier(HabiticaBaseApplication.this, lazyApiHelper);
             }
         });