From b3f7405d90fc1adaebcdd1eab4e404a4b44bf25c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Sun, 4 Sep 2016 16:01:23 +0200
Subject: [PATCH] display tasks for broken tasksOrder lists

Fixes #603
---
 .../habitrpg/android/habitica/APIHelper.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 53ac42bf1..7369fba79 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
@@ -347,6 +347,22 @@ public class APIHelper implements Action1<Throwable> {
                 habitRPGUser.setDailys(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getDailys()));
                 habitRPGUser.setTodos(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getTodos()));
                 habitRPGUser.setRewards(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getRewards()));
+                for (Task task : tasks.tasks.values()) {
+                    switch (task.getType()) {
+                        case "habit":
+                            habitRPGUser.getHabits().add(task);
+                            break;
+                        case "daily":
+                            habitRPGUser.getDailys().add(task);
+                            break;
+                        case "todo":
+                            habitRPGUser.getTodos().add(task);
+                            break;
+                        case "reward":
+                            habitRPGUser.getRewards().add(task);
+                            break;
+                    }
+                }
                 return habitRPGUser;
             });
         }
@@ -362,6 +378,7 @@ public class APIHelper implements Action1<Throwable> {
                 task.position = position;
                 taskList.add(task);
                 position++;
+                taskMap.remove(taskId);
             }
         }
         return taskList;