From 3bca8be3f43f2fdc32d7b6e6dfd292ec04b57613 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 17 Jun 2016 12:44:06 +0200
Subject: [PATCH] Fix network error on first startup

---
 .../main/java/com/habitrpg/android/habitica/APIHelper.java   | 4 ++++
 .../android/habitica/ui/activities/MainActivity.java         | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
index b0a2ea261..577f3e990 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
@@ -342,6 +342,10 @@ public class APIHelper implements Action1<Throwable> {
         return taskList;
     }
 
+    public boolean hasAuthenticationKeys() {
+        return this.hostConfig.getUser() != null;
+    }
+
     public class ErrorResponse{
         public String message;
     }
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 e4eaebacd..7659465f4 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
@@ -192,8 +192,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!HabiticaApplication.checkUserAuthentication(this, hostConfig))
+        if (!HabiticaApplication.checkUserAuthentication(this, hostConfig)) {
             return;
+        }
 
         //Check if reminder alarm is set
         scheduleReminder(this);
@@ -232,7 +233,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
         //resync, if last sync was more than 10 minutes ago
         if (this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
-            if (this.apiHelper != null) {
+            if (this.apiHelper != null && this.apiHelper.hasAuthenticationKeys()) {
                 this.apiHelper.retrieveUser(true)
                         .compose(apiHelper.configureApiCallObserver())
                         .subscribe(new HabitRPGUserCallback(this), throwable -> {});