From 4e60b9a4b7134d679cb4c9196c062019dea77cfa Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 21 Jan 2016 21:14:37 +0100
Subject: [PATCH] handle empty date

---
 Habitica/assets/paperboy/changelog.json                       | 4 ++--
 .../habitrpg/android/habitica/ui/fragments/PartyFragment.java | 4 +++-
 .../habitica/ui/fragments/PartyMemberListFragment.java        | 4 ++--
 .../habitrpgwrapper/lib/utils/DateDeserializer.java           | 3 +++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Habitica/assets/paperboy/changelog.json b/Habitica/assets/paperboy/changelog.json
index a78fb248f..acf21be96 100644
--- a/Habitica/assets/paperboy/changelog.json
+++ b/Habitica/assets/paperboy/changelog.json
@@ -4,7 +4,7 @@
     "items":[
       {
         "type": "F",
-        "title": "Customizde avatar inside the app"
+        "title": "Customize avatar inside the app"
       },
       {
         "type": "F",
@@ -20,7 +20,7 @@
       },
       {
         "type": "F",
-        "title": "Added Due date to todos"
+        "title": "Added Due date to to-dos"
       },
       {
         "type": "B",
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java
index c02488a59..8931bb319 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java
@@ -115,7 +115,9 @@ public class PartyFragment extends BaseFragment {
                         break;
                     }
                     case 2: {
-                        fragment = partyMemberListFragment = new PartyMemberListFragment(activity, group);
+                        PartyMemberListFragment memberFragment = new PartyMemberListFragment();
+                        memberFragment.configure(activity, group);
+                        fragment = memberFragment;
                         break;
                     }
                     default:
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyMemberListFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyMemberListFragment.java
index 48ceed16e..c41f9aec2 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyMemberListFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyMemberListFragment.java
@@ -30,11 +30,10 @@ public class PartyMemberListFragment extends Fragment {
 
     private PartyMemberRecyclerViewAdapter viewAdapter;
 
-    public PartyMemberListFragment(Context ctx, Group group) {
+    public void configure(Context ctx, Group group) {
         this.ctx = ctx;
         this.group = group;
 
-        viewAdapter = new PartyMemberRecyclerViewAdapter();
     }
 
     private View view;
@@ -58,6 +57,7 @@ public class PartyMemberListFragment extends Fragment {
         ButterKnife.bind(this, view);
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+        viewAdapter = new PartyMemberRecyclerViewAdapter();
         mRecyclerView.setAdapter(viewAdapter);
 
         if (group != null) {
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializer.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializer.java
index 97ed9e72a..595a05a3d 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializer.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializer.java
@@ -33,6 +33,9 @@ public class DateDeserializer implements JsonDeserializer<Date> {
 
     @Override
     public synchronized Date deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) {
+        if (jsonElement.getAsString().length() == 0) {
+            return null;
+        }
         try {
             return dateFormat.parse(jsonElement.getAsString());
         } catch (ParseException e) {