diff --git a/Habitica/res/layout/fragment_report_message.xml b/Habitica/res/layout/fragment_report_message.xml deleted file mode 100644 index e46e80ed2..000000000 --- a/Habitica/res/layout/fragment_report_message.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java index b9b976dd1..db90b5088 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java @@ -10,15 +10,11 @@ import com.habitrpg.android.habitica.models.Tag; import com.habitrpg.android.habitica.models.TutorialStep; import com.habitrpg.android.habitica.models.WorldState; import com.habitrpg.android.habitica.models.inventory.Customization; -import com.habitrpg.android.habitica.models.inventory.Egg; import com.habitrpg.android.habitica.models.inventory.Equipment; -import com.habitrpg.android.habitica.models.inventory.Food; -import com.habitrpg.android.habitica.models.inventory.HatchingPotion; import com.habitrpg.android.habitica.models.inventory.Mount; import com.habitrpg.android.habitica.models.inventory.Pet; import com.habitrpg.android.habitica.models.inventory.Quest; import com.habitrpg.android.habitica.models.inventory.QuestCollect; -import com.habitrpg.android.habitica.models.inventory.QuestContent; import com.habitrpg.android.habitica.models.inventory.QuestDropItem; import com.habitrpg.android.habitica.models.members.Member; import com.habitrpg.android.habitica.models.responses.FeedResponse; @@ -47,13 +43,9 @@ import com.habitrpg.android.habitica.utils.FeedResponseDeserializer; import com.habitrpg.android.habitica.utils.FindUsernameResultDeserializer; import com.habitrpg.android.habitica.utils.GroupSerialization; import com.habitrpg.android.habitica.utils.MemberSerialization; -import com.habitrpg.android.habitica.utils.MountListDeserializer; -import com.habitrpg.android.habitica.utils.MountMapDeserializer; import com.habitrpg.android.habitica.utils.OwnedItemListDeserializer; import com.habitrpg.android.habitica.utils.OwnedMountListDeserializer; import com.habitrpg.android.habitica.utils.OwnedPetListDeserializer; -import com.habitrpg.android.habitica.utils.PetListDeserializer; -import com.habitrpg.android.habitica.utils.PetMapDeserializer; import com.habitrpg.android.habitica.utils.PurchasedDeserializer; import com.habitrpg.android.habitica.utils.QuestCollectDeserializer; import com.habitrpg.android.habitica.utils.QuestDeserializer; @@ -83,10 +75,6 @@ public class GSonFactoryCreator { Type tutorialStepListType = new TypeToken>() {}.getType(); Type faqArticleListType = new TypeToken>() {}.getType(); Type itemDataListType = new TypeToken>() {}.getType(); - Type petMapType = new TypeToken>() {}.getType(); - Type mountMapType = new TypeToken>() {}.getType(); - Type petListType = new TypeToken>() {}.getType(); - Type mountListType = new TypeToken>() {}.getType(); Type questCollectListType = new TypeToken>() {}.getType(); Type chatMessageListType = new TypeToken>() {}.getType(); Type challengeListType = new TypeToken>() {}.getType(); @@ -111,10 +99,6 @@ public class GSonFactoryCreator { .registerTypeAdapter(Group.class, new GroupSerialization()) .registerTypeAdapter(Date.class, new DateDeserializer()) .registerTypeAdapter(itemDataListType, new EquipmentListDeserializer()) - .registerTypeAdapter(petListType, new PetListDeserializer()) - .registerTypeAdapter(mountListType, new MountListDeserializer()) - .registerTypeAdapter(petMapType, new PetMapDeserializer()) - .registerTypeAdapter(mountMapType, new MountMapDeserializer()) .registerTypeAdapter(ChatMessage.class, new ChatMessageDeserializer()) .registerTypeAdapter(Task.class, new TaskSerializer()) .registerTypeAdapter(ContentResult.class, new ContentDeserializer()) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java deleted file mode 100644 index ac842994f..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.habitrpg.android.habitica.utils; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.habitrpg.android.habitica.models.inventory.Mount; - -import java.lang.reflect.Type; -import java.util.List; -import java.util.Map; - -import io.realm.Realm; -import io.realm.RealmList; - -public class MountListDeserializer implements JsonDeserializer> { - - @Override - public RealmList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - RealmList vals = new RealmList<>(); - if (json.isJsonObject()) { - - for (Map.Entry entry : json.getAsJsonObject().entrySet()) { - Mount mount = new Mount(); - mount.setKey(entry.getKey()); - mount.setAnimal(entry.getKey().split("-")[0]); - mount.setColor(entry.getKey().split("-")[1]); - vals.add(mount); - } - } else { - for (JsonElement item : json.getAsJsonArray()) { - vals.add(context.deserialize(item.getAsJsonObject(), Mount.class)); - } - } - - return vals; - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java deleted file mode 100644 index 527321e93..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.habitrpg.android.habitica.utils; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.habitrpg.android.habitica.models.inventory.Mount; - -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import io.realm.Realm; - -public class MountMapDeserializer implements JsonDeserializer> { - @Override - public Map deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - HashMap vals = new HashMap<>(); - if (json.isJsonObject()) { - JsonObject object = json.getAsJsonObject(); - - Realm realm = Realm.getDefaultInstance(); - List existingItems = realm.copyFromRealm(realm.where(Mount.class).findAll()); - realm.close(); - - for (Mount mount : existingItems) { - if (object.has(mount.getKey())) { - vals.put(mount.getKey(), mount); - object.remove(mount.getKey()); - } - } - - for (Map.Entry entry : json.getAsJsonObject().entrySet()) { - Mount mount; - mount = new Mount(); - mount.setKey(entry.getKey()); - mount.setAnimal(entry.getKey().split("-")[0]); - mount.setColor(entry.getKey().split("-")[1]); - vals.put(mount.getKey(), mount); - } - } - - return vals; - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java deleted file mode 100644 index 859ade3a1..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.habitrpg.android.habitica.utils; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.habitrpg.android.habitica.models.inventory.Food; -import com.habitrpg.android.habitica.models.inventory.Pet; - -import java.lang.reflect.Type; -import java.util.List; -import java.util.Map; - -import io.realm.Realm; -import io.realm.RealmList; - -public class PetListDeserializer implements JsonDeserializer> { - @Override - public RealmList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - RealmList vals = new RealmList<>(); - if (json.isJsonObject()) { - for (Map.Entry entry : json.getAsJsonObject().entrySet()) { - Pet pet = new Pet(); - pet.setKey(entry.getKey()); - pet.setAnimal(entry.getKey().split("-")[0]); - pet.setColor(entry.getKey().split("-")[1]); - vals.add(pet); - } - } else { - for (JsonElement item : json.getAsJsonArray()) { - vals.add(context.deserialize(item.getAsJsonObject(), Food.class)); - } - } - - return vals; - } -} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java deleted file mode 100644 index 0191797ea..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.habitrpg.android.habitica.utils; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.habitrpg.android.habitica.models.inventory.Pet; - -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import io.realm.Realm; - -public class PetMapDeserializer implements JsonDeserializer> { - @Override - public Map deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - HashMap vals = new HashMap<>(); - if (json.isJsonObject()) { - JsonObject object = json.getAsJsonObject(); - - Realm realm = Realm.getDefaultInstance(); - List existingItems = realm.copyFromRealm(realm.where(Pet.class).findAll()); - realm.close(); - - for (Pet pet : existingItems) { - if (object.has(pet.getKey())) { - vals.put(pet.getKey(), pet); - object.remove(pet.getKey()); - } - } - - for (Map.Entry entry : json.getAsJsonObject().entrySet()) { - Pet pet; - pet = new Pet(); - pet.setKey(entry.getKey()); - pet.setAnimal(entry.getKey().split("-")[0]); - pet.setColor(entry.getKey().split("-")[1]); - vals.put(pet.getKey(), pet); - } - } - - return vals; - } -}