From a871b3f1a5d0fbb187348f38d5028e28b1aa2a0b Mon Sep 17 00:00:00 2001 From: Negue Date: Mon, 21 Dec 2015 18:59:08 +0100 Subject: [PATCH] fixes NPE- MainActivity user --- .../android/habitica/MainActivity.java | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java index 50e167d23..a116df93b 100644 --- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java @@ -21,7 +21,7 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import butterknife.ButterKnife; + import com.afollestad.materialdialogs.MaterialDialog; import com.crashlytics.android.Crashlytics; import com.crashlytics.android.core.CrashlyticsCore; @@ -60,13 +60,9 @@ import com.raizlabs.android.dbflow.sql.language.Delete; import com.raizlabs.android.dbflow.sql.language.From; import com.raizlabs.android.dbflow.sql.language.Select; import com.raizlabs.android.dbflow.sql.language.Where; -import de.greenrobot.event.EventBus; -import io.fabric.sdk.android.Fabric; + import org.solovyev.android.checkout.ActivityCheckout; import org.solovyev.android.checkout.Checkout; -import retrofit.Callback; -import retrofit.RetrofitError; -import retrofit.client.Response; import java.util.ArrayList; import java.util.Calendar; @@ -261,23 +257,26 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb new Thread(new Runnable() { public void run() { - ArrayList allTasks = new ArrayList<>(); - allTasks.addAll(user.getDailys()); - allTasks.addAll(user.getTodos()); - allTasks.addAll(user.getHabits()); - allTasks.addAll(user.getRewards()); + // multiple crashes because user is null + if(user != null) { + ArrayList allTasks = new ArrayList<>(); + allTasks.addAll(user.getDailys()); + allTasks.addAll(user.getTodos()); + allTasks.addAll(user.getHabits()); + allTasks.addAll(user.getRewards()); - loadAndRemoveOldTasks(user.getId(), allTasks); + loadAndRemoveOldTasks(user.getId(), allTasks); - ArrayList allChecklistItems = new ArrayList<>(); + ArrayList allChecklistItems = new ArrayList<>(); - for (Task t : allTasks) { - if (t.checklist != null) { - allChecklistItems.addAll(t.checklist); + for (Task t : allTasks) { + if (t.checklist != null) { + allChecklistItems.addAll(t.checklist); + } } - } - loadAndRemoveOldChecklists(allChecklistItems); + loadAndRemoveOldChecklists(allChecklistItems); + } } }).start(); }else{