From 6ae64daaf684e851cba643ccfb3c3d26d2eb724b Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 25 Apr 2016 14:28:38 +0200
Subject: [PATCH] fix several fragments

---
 .../android/habitica/ui/activities/LoginActivity.java  |  2 +-
 .../android/habitica/ui/activities/MainActivity.java   |  1 -
 .../ui/adapter/inventory/ItemRecyclerAdapter.java      |  2 +-
 .../ui/adapter/social/ChatRecyclerViewAdapter.java     | 10 ++++------
 .../customization/AvatarCustomizationFragment.java     |  2 +-
 .../customization/AvatarOverviewFragment.java          |  4 ++++
 .../ui/fragments/setup/AvatarSetupFragment.java        |  2 +-
 .../habitica/ui/fragments/social/ChatListFragment.java |  6 +++---
 .../habitrpgwrapper/lib/models/PlayerMinStats.java     |  4 ++--
 9 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
index 77a6c0972..9cee089ec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
@@ -332,7 +332,7 @@ startActivity(i);
         } else {
             JSONObject eventProperties = new JSONObject();
             try {
-                eventProperties.put("eventAction", "lofin");
+                eventProperties.put("eventAction", "login");
                 eventProperties.put("eventCategory", "behaviour");
                 eventProperties.put("hitType", "event");
             } catch (JSONException exception) {
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 334df608b..da5f95fc9 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
@@ -617,7 +617,6 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
 
             }
         }
-
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
index 2f4cd8e84..990b0f352 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
@@ -91,7 +91,7 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
             } else {
                 petKey = hatchingItem.getKey() + "-" + item.getKey();
             }
-            return ownedPets.containsKey(petKey) && ownedPets.get(petKey) != null;
+            return ownedPets != null && ownedPets.containsKey(petKey) && ownedPets.get(petKey) > 0;
         }
 
         public void bind(Item item) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
index 8a7b70fe7..806eb0303 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
@@ -47,14 +47,12 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
     private static final int TYPE_MESSAGE = 2;
 
     private List<ChatMessage> messages;
-    private Context viewContext;
     private String uuid;
     private String groupId;
     private boolean isTavern;
 
-    public ChatRecyclerViewAdapter(List<ChatMessage> messages, Context viewContext, String uuid, String groupId, boolean isTavern) {
+    public ChatRecyclerViewAdapter(List<ChatMessage> messages, String uuid, String groupId, boolean isTavern) {
         this.messages = messages;
-        this.viewContext = viewContext;
         this.uuid = uuid;
         this.groupId = groupId;
         this.isTavern = isTavern;
@@ -94,7 +92,7 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
         View view = LayoutInflater.from(parent.getContext())
                 .inflate(rLayout, parent, false);
 
-        return new ChatRecyclerViewHolder(view, viewType, viewContext, uuid, groupId);
+        return new ChatRecyclerViewHolder(view, viewType, uuid, groupId);
     }
 
     @Override
@@ -174,7 +172,7 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
         Context context;
         Resources res;
 
-        public ChatRecyclerViewHolder(View itemView, int layoutType, Context viewContext, String currentUserId, String groupId) {
+        public ChatRecyclerViewHolder(View itemView, int layoutType, String currentUserId, String groupId) {
             super(itemView);
             this.layoutType = layoutType;
             this.uuid = currentUserId;
@@ -182,7 +180,7 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
 
             ButterKnife.bind(this, itemView);
 
-            context = viewContext;
+            context = itemView.getContext();
 
             res = context.getResources();
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index ab8da14ab..c60ca4e2b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -97,7 +97,7 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
         if (this.category != null) {
             select = select.and(Condition.column("category").eq(this.category));
         }
-        if (this.type.equals("background")) {
+        if (this.type != null && this.type.equals("background")) {
             select.orderBy(OrderBy.columns("customizationSetName").descending());
         } else {
             select.orderBy(true, "customizationSet");
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java
index 6a3c26332..b83445ad9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java
@@ -75,6 +75,10 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
         super.onCreateView(inflater, container, savedInstanceState);
         View v = inflater.inflate(R.layout.fragment_avatar_overview, container, false);
 
+        if (this.user == null) {
+            return v;
+        }
+
         viewBinding = DataBindingUtil.bind(v);
         viewBinding.setPreferences(this.user.getPreferences());
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
index c5dce4ad7..4fdc29633 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
@@ -72,7 +72,7 @@ public class AvatarSetupFragment extends BaseFragment {
             }
         });
         this.recyclerView.setLayoutManager(this.layoutManager);
-        this.recyclerView.addItemDecoration(new MarginDecoration(this.activity));
+        this.recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
 
         this.recyclerView.setAdapter(this.adapter);
         this.loadCustomizations();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
index 0ef139291..3cc03b08d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
@@ -129,7 +129,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
             mRecyclerView.setLayoutManager(layoutManager);
         }
 
-        ChatRecyclerViewAdapter tavernAdapter = new ChatRecyclerViewAdapter(new ArrayList<ChatMessage>(), ctx, userId, groupId, isTavern);
+        ChatRecyclerViewAdapter tavernAdapter = new ChatRecyclerViewAdapter(new ArrayList<ChatMessage>(), userId, groupId, isTavern);
 
         mRecyclerView.setAdapter(tavernAdapter);
 
@@ -157,7 +157,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
         currentChatMessages = chatMessages;
 
         //Load unparsed messages first
-        ChatRecyclerViewAdapter tavernAdapter = new ChatRecyclerViewAdapter(chatMessages, ctx, userId, groupId, isTavern);
+        ChatRecyclerViewAdapter tavernAdapter = new ChatRecyclerViewAdapter(chatMessages, userId, groupId, isTavern);
 
         if(mRecyclerView != null) {
             mRecyclerView.setAdapter(tavernAdapter);
@@ -325,7 +325,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
         }
 
         protected void onPostExecute(Void result) {
-            ChatRecyclerViewAdapter tavernAdapter = new ChatRecyclerViewAdapter(chatMessages, ctx, userId, groupId, isTavern);
+            ChatRecyclerViewAdapter tavernAdapter = new ChatRecyclerViewAdapter(chatMessages, userId, groupId, isTavern);
 
             if(mRecyclerView != null) {
                 mRecyclerView.setAdapter(tavernAdapter);
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
index 50a58793c..67ce8052b 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
@@ -15,13 +15,13 @@ public abstract class PlayerMinStats extends BasicStats {
     @ForeignKey(references = {@ForeignKeyReference(columnName = "trainingstats_id",
             columnType = String.class,
             foreignColumnName = "id")})
-    public BasicStats training;//stats.training
+    public BasicStats training;
 
     @Column
     @ForeignKey(references = {@ForeignKeyReference(columnName = "buffs_id",
             columnType = String.class,
             foreignColumnName = "id")})
-    public Buffs buffs;//stats.buffs
+    public Buffs buffs;
 
     @Column
     public int points, lvl;