From d00bb82f954ce5b4887bf1ef2190446c4d976d71 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Mon, 6 Jun 2016 16:18:50 -0500 Subject: [PATCH] Added reminders to the task serialization so they can be saved to the server --- .../src/main/java/com/habitrpg/android/habitica/APIHelper.java | 3 +++ .../java/com/habitrpg/android/habitica/modules/ApiModule.java | 2 ++ .../magicmicky/habitrpgwrapper/lib/utils/TaskSerializer.java | 2 ++ 3 files changed, 7 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 39270d77e..b0a2ea261 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java @@ -35,6 +35,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent; import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData; +import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem; import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList; import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag; @@ -55,6 +56,7 @@ import com.magicmicky.habitrpgwrapper.lib.utils.MountListDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.PetListDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.PurchasedDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.QuestListDeserializer; +import com.magicmicky.habitrpgwrapper.lib.utils.RemindersItemSerializer; import com.magicmicky.habitrpgwrapper.lib.utils.SkillDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.TaskListDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.TaskSerializer; @@ -217,6 +219,7 @@ public class APIHelper implements Action1 { .registerTypeAdapter(boolean.class, new BooleanAsIntAdapter()) .registerTypeAdapter(skillListType, new SkillDeserializer()) .registerTypeAdapter(ChecklistItem.class, new ChecklistItemSerializer()) + .registerTypeAdapter(RemindersItem.class, new RemindersItemSerializer()) .registerTypeAdapter(TaskList.class, new TaskListDeserializer()) .registerTypeAdapter(Purchases.class, new PurchasedDeserializer()) .registerTypeAdapter(customizationListType, new CustomizationDeserializer()) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java index d3c41dae3..642f27d31 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java @@ -27,6 +27,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent; import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData; +import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem; import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList; import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag; @@ -47,6 +48,7 @@ import com.magicmicky.habitrpgwrapper.lib.utils.MountListDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.PetListDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.PurchasedDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.QuestListDeserializer; +import com.magicmicky.habitrpgwrapper.lib.utils.RemindersItemSerializer; import com.magicmicky.habitrpgwrapper.lib.utils.SkillDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.TaskListDeserializer; import com.magicmicky.habitrpgwrapper.lib.utils.TaskSerializer; diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskSerializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskSerializer.java index 0404ac8cd..064022beb 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskSerializer.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskSerializer.java @@ -39,6 +39,7 @@ public class TaskSerializer implements JsonSerializer { obj.add("startDate", context.serialize(task.getStartDate())); obj.addProperty("streak", task.getStreak()); obj.add("checklist", context.serialize(task.getChecklist())); + obj.add("reminders", context.serialize(task.getReminders())); obj.addProperty("completed", task.getCompleted()); break; case "todo": @@ -48,6 +49,7 @@ public class TaskSerializer implements JsonSerializer { obj.add("date", context.serialize(task.getDueDate())); } obj.add("checklist", context.serialize(task.getChecklist())); + obj.add("reminders", context.serialize(task.getReminders())); obj.addProperty("completed", task.getCompleted()); break; }