From 3bcce0755d624f731b2f49990237df6e33a43370 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 15 Apr 2016 11:46:29 +0200
Subject: [PATCH] fix various crashes

---
 .../android/habitica/ui/activities/MainActivity.java        | 6 +++---
 .../android/habitica/ui/activities/TaskFormActivity.java    | 2 +-
 .../ui/adapter/social/QuestCollectRecyclerViewAdapter.java  | 6 ++++--
 .../habitica/ui/fragments/inventory/StableFragment.java     | 4 +++-
 .../ui/fragments/inventory/StableRecyclerFragment.java      | 4 ++--
 .../ui/fragments/inventory/items/ItemsFragment.java         | 5 +++--
 .../habitica/ui/fragments/social/TavernFragment.java        | 4 +++-
 7 files changed, 19 insertions(+), 12 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 1f54bdb47..632ee54c7 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
@@ -544,19 +544,19 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
         accountHeader.updateProfile(profile);
 
         IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
-        if (user.getPreferences().getDisableClasses()) {
+        if (user.getPreferences().getDisableClasses() || !user.getFlags().getClassSelected()) {
             if (item != null) {
                 drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
             }
         } else {
             IDrawerItem newItem = item;
-            if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS && item.isEnabled()) {
+            if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS) {
                 newItem = new PrimaryDrawerItem()
                         .withName(this.getString(R.string.sidebar_skills))
                         .withEnabled(false)
                         .withBadge(this.getString(R.string.unlock_lvl_11))
                         .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
-            } else if (user.getStats().getLvl() >= MIN_LEVEL_FOR_SKILLS && !item.isEnabled()) {
+            } else if (user.getStats().getLvl() >= MIN_LEVEL_FOR_SKILLS) {
                 newItem = new PrimaryDrawerItem()
                         .withName(this.getString(R.string.sidebar_skills))
                         .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index 1c090624a..42235f497 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -631,7 +631,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
 
         for (TaskTag tt : task.getTags()) {
             int position = tagIds.indexOf(tt.getTag().getId());
-            if (tagCheckBoxList.size() > position) {
+            if (tagCheckBoxList.size() > position && position >= 0) {
                 tagCheckBoxList.get(position).setChecked(true);
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
index 69091f21a..7f759500a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
@@ -76,8 +76,10 @@ public class QuestCollectRecyclerViewAdapter extends RecyclerView.Adapter<QuestC
             Picasso.with(view.getContext())
                     .load("https://habitica-assets.s3.amazonaws.com/mobileApp/images/" + "quest_" + quest.getKey() + "_" + key + ".png")
                     .into(image);
-            name.setText(quest.getCollect().get(key).text);
-            count.setText(progress.collect.get(key) + " / " + quest.getCollect().get(key).count);
+            if (quest.getCollect().get(key) != null) {
+                name.setText(quest.getCollect().get(key).text);
+                count.setText(progress.collect.get(key) + " / " + quest.getCollect().get(key).count);
+            }
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableFragment.java
index 3cfd2dae5..4761e7566 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableFragment.java
@@ -76,6 +76,8 @@ public class StableFragment extends BaseMainFragment {
             }
         });
 
-        tabLayout.setupWithViewPager(viewPager);
+        if (tabLayout != null && viewPager != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java
index e83dc0b36..c7e22ffe9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java
@@ -177,7 +177,7 @@ public class StableRecyclerFragment extends BaseFragment {
                 }
                 switch (itemType) {
                     case "pets":
-                        if (user.getItems().getPets().containsKey(animal.getKey()) && user.getItems().getPets().get(animal.getKey()) != null) {
+                        if (user.getItems().getPets() != null && user.getItems().getPets().containsKey(animal.getKey()) && user.getItems().getPets().get(animal.getKey()) != null) {
                             if (lastAnimal.getNumberOwned() == 0) {
                                 lastAnimal.setColor(animal.getColor());
                             }
@@ -185,7 +185,7 @@ public class StableRecyclerFragment extends BaseFragment {
                         }
                         break;
                     case "mounts":
-                        if (user.getItems().getMounts().containsKey(animal.getKey()) && user.getItems().getMounts().get(animal.getKey()) != null) {
+                        if (user.getItems().getMounts() != null && user.getItems().getMounts().containsKey(animal.getKey()) && user.getItems().getMounts().get(animal.getKey()) != null) {
                             if (lastAnimal.getNumberOwned() == 0) {
                                 lastAnimal.setColor(animal.getColor());
                             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
index a05f1794f..3b971c16f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
@@ -103,8 +103,9 @@ public class ItemsFragment extends BaseMainFragment {
                 return "";
             }
         });
-
-        tabLayout.setupWithViewPager(viewPager);
+        if (tabLayout != null && viewPager != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
     }
 
     @Subscribe
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
index a79a5988a..a2a4817bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
@@ -125,6 +125,8 @@ public class TavernFragment extends BaseMainFragment implements Callback<Group>
             }
         });
 
-        tabLayout.setupWithViewPager(viewPager);
+        if (tabLayout != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
     }
 }