From 92e04d743181b7dc81befe81de29cdcba92e7e0b Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 3 Jun 2021 17:38:50 +0200 Subject: [PATCH] Make objects cascade when deleting them --- .../habitica/HabiticaBaseApplication.kt | 2 +- .../android/habitica/models/IAPGift.java | 6 - .../android/habitica/models/IAPGift.kt | 5 + .../models/PurchaseValidationResult.java | 6 - .../models/PurchaseValidationResult.kt | 6 + .../android/habitica/models/TutorialStep.kt | 2 + .../habitica/models/VersionedObject.kt | 1 - .../habitica/models/WorldStateEvent.kt | 2 + .../models/auth/LocalAuthentication.kt | 2 + .../habitica/models/auth/UserAuth.java | 43 ----- .../android/habitica/models/auth/UserAuth.kt | 8 + .../habitica/models/auth/UserAuthSocial.java | 26 --- .../habitica/models/auth/UserAuthSocial.kt | 7 + .../models/auth/UserAuthSocialTokens.java | 25 --- .../models/auth/UserAuthSocialTokens.kt | 6 + .../models/inventory/QuestProgress.kt | 2 + .../models/inventory/QuestProgressCollect.kt | 2 + .../models/members/MemberPreferences.kt | 2 + .../models/shops/ShopItemUnlockCondition.kt | 2 + .../models/social/ChallengeMembership.kt | 2 + .../habitica/models/social/ChatMessageLike.kt | 6 +- .../habitica/models/social/GroupCategory.kt | 2 + .../habitica/models/social/GroupMembership.kt | 2 + .../habitica/models/social/UserParty.kt | 2 + .../habitica/models/social/UserStyles.kt | 2 + .../habitica/models/tasks/ChecklistItem.kt | 2 + .../android/habitica/models/tasks/Days.java | 148 ------------------ .../android/habitica/models/tasks/Days.kt | 56 +++++++ .../habitica/models/tasks/RemindersItem.kt | 2 + .../habitica/models/tasks/TaskGroupPlan.kt | 2 + .../android/habitica/models/tasks/TaskTag.kt | 2 + .../habitica/models/user/Authentication.kt | 2 + .../models/user/AuthenticationTimestamps.kt | 2 + .../android/habitica/models/user/Backer.kt | 2 + .../android/habitica/models/user/Buffs.kt | 2 + .../habitica/models/user/ContributorInfo.kt | 2 + .../user/EmailNotificationsPreference.kt | 2 + .../android/habitica/models/user/Flags.kt | 2 + .../android/habitica/models/user/Gear.kt | 2 + .../android/habitica/models/user/Hair.kt | 2 + .../android/habitica/models/user/Inbox.kt | 2 + .../android/habitica/models/user/Items.kt | 2 + .../android/habitica/models/user/Outfit.kt | 2 + .../models/user/OwnedCustomization.kt | 2 + .../android/habitica/models/user/OwnedItem.kt | 2 + .../habitica/models/user/OwnedMount.kt | 2 + .../android/habitica/models/user/OwnedPet.kt | 2 + .../habitica/models/user/Preferences.kt | 2 + .../android/habitica/models/user/Profile.kt | 2 + .../android/habitica/models/user/Purchases.kt | 2 + .../user/PushNotificationsPreference.kt | 2 + .../habitica/models/user/SpecialItems.kt | 2 + .../android/habitica/models/user/Stats.kt | 2 + .../habitica/models/user/SubscriptionPlan.kt | 2 + .../user/SubscriptionPlanConsecutive.kt | 2 + .../habitica/models/user/SuppressedModals.kt | 2 + .../android/habitica/models/user/Training.kt | 2 + .../habitica/models/user/UserAchievement.kt | 4 +- 58 files changed, 178 insertions(+), 261 deletions(-) delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/IAPGift.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/IAPGift.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.kt diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt index 0d09ea39f..d067679fc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt @@ -111,7 +111,7 @@ abstract class HabiticaBaseApplication : Application() { .compactOnLaunch { totalBytes, usedBytes -> // Compact if the file is over 100MB in size and less than 50% 'used' - val oneHundredMB = 100 * 1024 * 1024 + val oneHundredMB = 50 * 1024 * 1024 (totalBytes > oneHundredMB) && (usedBytes / totalBytes) < 0.5 } try { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/IAPGift.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/IAPGift.java deleted file mode 100644 index ea44780be..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/IAPGift.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.habitrpg.android.habitica.models; - -public class IAPGift { - public String uuid; - -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/IAPGift.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/IAPGift.kt new file mode 100644 index 000000000..2ad438328 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/IAPGift.kt @@ -0,0 +1,5 @@ +package com.habitrpg.android.habitica.models + +class IAPGift { + var uuid: String? = null +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java deleted file mode 100644 index fa673580f..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.habitrpg.android.habitica.models; - -public class PurchaseValidationResult { - public boolean ok; - public Object data; -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.kt new file mode 100644 index 000000000..7ae6c5f5a --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.kt @@ -0,0 +1,6 @@ +package com.habitrpg.android.habitica.models + +class PurchaseValidationResult { + var ok = false + var data: Any? = null +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt index b125270df..c4fbcc11b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt @@ -3,8 +3,10 @@ package com.habitrpg.android.habitica.models import io.realm.RealmModel import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass import java.util.* +@RealmClass(embedded = true) open class TutorialStep: RealmObject(), BaseMainObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/VersionedObject.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/VersionedObject.kt index e154a65e1..e7046e4b0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/VersionedObject.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/VersionedObject.kt @@ -1,6 +1,5 @@ package com.habitrpg.android.habitica.models interface VersionedObject { - var versionNumber: Int } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldStateEvent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldStateEvent.kt index e0d6079c4..67f0a6029 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldStateEvent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldStateEvent.kt @@ -4,8 +4,10 @@ import com.google.gson.annotations.SerializedName import io.realm.RealmModel import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass import java.util.* +@RealmClass(embedded = true) open class WorldStateEvent: RealmObject(), BaseMainObject { val isCurrentlyActive: Boolean get() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.kt index 09709e96b..88031e5de 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.kt @@ -3,7 +3,9 @@ package com.habitrpg.android.habitica.models.auth import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class LocalAuthentication : RealmObject(), BaseObject { @PrimaryKey var userID: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java deleted file mode 100644 index e2e45a657..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.habitrpg.android.habitica.models.auth; - -/** - * Created by magicmicky on 04/02/15. - */ -public class UserAuth { - private String username; - private String password; - private String confirmPassword; - private String email; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getConfirmPassword() { - return confirmPassword; - } - - public void setConfirmPassword(String confirmPassword) { - this.confirmPassword = confirmPassword; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.kt new file mode 100644 index 000000000..c2d34a203 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.kt @@ -0,0 +1,8 @@ +package com.habitrpg.android.habitica.models.auth + +class UserAuth { + var username: String? = null + var password: String? = null + var confirmPassword: String? = null + var email: String? = null +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java deleted file mode 100644 index 89caecc85..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.habitrpg.android.habitica.models.auth; - -/** - * Created by viirus on 13/11/15. - */ -public class UserAuthSocial { - private String network; - private UserAuthSocialTokens authResponse; - - public String getNetwork() { - return network; - } - - public void setNetwork(String network) { - this.network = network; - } - - public UserAuthSocialTokens getAuthResponse() { - return authResponse; - } - - public void setAuthResponse(UserAuthSocialTokens authResponse) { - this.authResponse = authResponse; - } - -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.kt new file mode 100644 index 000000000..dcbc2e155 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.kt @@ -0,0 +1,7 @@ +package com.habitrpg.android.habitica.models.auth + + +class UserAuthSocial { + var network: String? = null + var authResponse: UserAuthSocialTokens? = null +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java deleted file mode 100644 index e19dc2dd3..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.habitrpg.android.habitica.models.auth; - -/** - * Created by viirus on 13/11/15. - */ -public class UserAuthSocialTokens { - private String client_id; - private String access_token; - - public String getClient_id() { - return client_id; - } - - public void setClient_id(String client_id) { - this.client_id = client_id; - } - - public String getAccess_token() { - return access_token; - } - - public void setAccess_token(String access_token) { - this.access_token = access_token; - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.kt new file mode 100644 index 000000000..a157dbb22 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.kt @@ -0,0 +1,6 @@ +package com.habitrpg.android.habitica.models.auth + +class UserAuthSocialTokens { + var client_id: String? = null + var access_token: String? = null +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt index 71873f55a..91cf11789 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt @@ -4,7 +4,9 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class QuestProgress : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgressCollect.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgressCollect.kt index 0a44d647e..22f39be47 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgressCollect.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgressCollect.kt @@ -3,7 +3,9 @@ package com.habitrpg.android.habitica.models.inventory import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class QuestProgressCollect : RealmObject(), BaseObject { @PrimaryKey var key: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt index d764ba74e..dc252f72f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt @@ -6,7 +6,9 @@ import com.habitrpg.android.habitica.models.user.Hair import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class MemberPreferences : RealmObject(), AvatarPreferences { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt index 6d09bdcca..12ae21892 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt @@ -6,7 +6,9 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class ShopItemUnlockCondition : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt index 7e79471c0..9a9e51843 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt @@ -3,7 +3,9 @@ package com.habitrpg.android.habitica.models.social import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class ChallengeMembership : RealmObject, BaseObject { @PrimaryKey var combinedID: String = "" diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessageLike.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessageLike.kt index 48748adce..903e0a277 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessageLike.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessageLike.kt @@ -3,11 +3,9 @@ package com.habitrpg.android.habitica.models.social import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass -/** - * Created by phillip on 30.06.17. - */ - +@RealmClass(embedded = true) open class ChatMessageLike : RealmObject, BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupCategory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupCategory.kt index 420172777..7a19214a4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupCategory.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupCategory.kt @@ -5,7 +5,9 @@ import com.habitrpg.android.habitica.models.BaseMainObject import io.realm.RealmModel import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class GroupCategory : RealmObject(), BaseMainObject { override val realmClass: Class get() = Group::class.java diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupMembership.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupMembership.kt index 97d62d659..23819213b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupMembership.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupMembership.kt @@ -3,7 +3,9 @@ package com.habitrpg.android.habitica.models.social import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class GroupMembership : RealmObject, BaseObject { @PrimaryKey var combinedID: String = "" diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.kt index c07b8334a..35cf3caff 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.kt @@ -6,7 +6,9 @@ import com.habitrpg.android.habitica.models.inventory.Quest import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class UserParty : RealmObject(), BaseObject { @PrimaryKey var userId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt index a6e246422..ebdf12ebe 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt @@ -7,7 +7,9 @@ import com.habitrpg.android.habitica.models.user.Preferences import com.habitrpg.android.habitica.models.user.Stats import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class UserStyles : RealmObject(), Avatar { @PrimaryKey var id: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt index ea08cc2f9..09183da58 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt @@ -7,8 +7,10 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmModel import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass import java.util.* +@RealmClass(embedded = true) open class ChecklistItem : RealmObject, BaseMainObject, Parcelable { override val realmClass: Class diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java deleted file mode 100644 index aac0f3e37..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.habitrpg.android.habitica.models.tasks; - -import android.os.Parcel; -import android.os.Parcelable; - -import io.realm.RealmObject; -import io.realm.annotations.PrimaryKey; - -public class Days extends RealmObject implements Parcelable { - - @PrimaryKey - private String taskId; - private boolean m, t, w, th, f, s, su; - - public boolean getT() { - return t; - } - - public void setT(boolean t) { - this.t = t; - } - - public boolean getW() { - return w; - } - - public void setW(boolean w) { - this.w = w; - } - - public boolean getTh() { - return th; - } - - public void setTh(boolean th) { - this.th = th; - } - - public boolean getF() { - return f; - } - - public void setF(boolean f) { - this.f = f; - } - - public boolean getS() { - return s; - } - - public void setS(boolean s) { - this.s = s; - } - - public boolean getSu() { - return su; - } - - public void setSu(boolean su) { - this.su = su; - } - - public boolean getM() { - return m; - } - - public void setM(boolean m) { - this.m = m; - } - - public boolean getForDay(int day) { - switch (day) { - case 2: - return this.getM(); - case 3: - return this.getT(); - case 4: - return this.getW(); - case 5: - return this.getTh(); - case 6: - return this.getF(); - case 7: - return this.getS(); - case 1: - return this.getSu(); - } - return false; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(this.taskId); - dest.writeByte(this.m ? (byte) 1 : (byte) 0); - dest.writeByte(this.t ? (byte) 1 : (byte) 0); - dest.writeByte(this.w ? (byte) 1 : (byte) 0); - dest.writeByte(this.th ? (byte) 1 : (byte) 0); - dest.writeByte(this.f ? (byte) 1 : (byte) 0); - dest.writeByte(this.s ? (byte) 1 : (byte) 0); - dest.writeByte(this.su ? (byte) 1 : (byte) 0); - } - - protected Days(Parcel in) { - this.taskId = in.readString(); - this.m = in.readByte() != 0; - this.t = in.readByte() != 0; - this.w = in.readByte() != 0; - this.th = in.readByte() != 0; - this.f = in.readByte() != 0; - this.s = in.readByte() != 0; - this.su = in.readByte() != 0; - } - - public Days() { - m = true; - t = true; - w = true; - th = true; - f = true; - s = true; - su = true; - } - - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override - public Days createFromParcel(Parcel source) { - return new Days(source); - } - - @Override - public Days[] newArray(int size) { - return new Days[size]; - } - }; - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.kt new file mode 100644 index 000000000..a2b8a944b --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.kt @@ -0,0 +1,56 @@ +package com.habitrpg.android.habitica.models.tasks + +import android.os.Parcel +import android.os.Parcelable +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass + +@RealmClass(embedded = true) +open class Days() : RealmObject(), Parcelable { + @PrimaryKey + var taskId: String? = null + var m: Boolean = true + var t: Boolean = true + var w: Boolean = true + var th: Boolean = true + var f: Boolean = true + var s: Boolean = true + var su: Boolean = true + + override fun writeToParcel(dest: Parcel, flags: Int) { + dest.writeString(taskId) + dest.writeByte(if (m) 1.toByte() else 0.toByte()) + dest.writeByte(if (t) 1.toByte() else 0.toByte()) + dest.writeByte(if (w) 1.toByte() else 0.toByte()) + dest.writeByte(if (th) 1.toByte() else 0.toByte()) + dest.writeByte(if (f) 1.toByte() else 0.toByte()) + dest.writeByte(if (s) 1.toByte() else 0.toByte()) + dest.writeByte(if (su) 1.toByte() else 0.toByte()) + } + + protected constructor(`in`: Parcel) : this() { + taskId = `in`.readString() + m = `in`.readByte().toInt() != 0 + t = `in`.readByte().toInt() != 0 + w = `in`.readByte().toInt() != 0 + th = `in`.readByte().toInt() != 0 + f = `in`.readByte().toInt() != 0 + s = `in`.readByte().toInt() != 0 + su = `in`.readByte().toInt() != 0 + } + + override fun describeContents(): Int { + return 0 + } + + companion object CREATOR : Parcelable.Creator { + override fun createFromParcel(parcel: Parcel): Days { + return Days(parcel) + } + + override fun newArray(size: Int): Array { + return arrayOfNulls(size) + } + } +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt index 483c662c1..b7da10aef 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt @@ -7,7 +7,9 @@ import java.util.Date import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class RemindersItem : RealmObject, Parcelable { @PrimaryKey var id: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt index a0810b6e9..7c02ef86f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt @@ -6,8 +6,10 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass import java.util.* +@RealmClass(embedded = true) open class TaskGroupPlan : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.kt index 431bf433f..ed79cc12e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.kt @@ -4,7 +4,9 @@ import com.habitrpg.android.habitica.models.BaseObject import com.habitrpg.android.habitica.models.Tag import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class TaskTag : RealmObject(), BaseObject { var tag: Tag? = null set(value) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.kt index 2b6ea10c5..d3a5da4b1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.kt @@ -6,7 +6,9 @@ import com.habitrpg.android.habitica.models.auth.LocalAuthentication import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Authentication : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/AuthenticationTimestamps.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/AuthenticationTimestamps.kt index 5e4e55706..32c81c1f0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/AuthenticationTimestamps.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/AuthenticationTimestamps.kt @@ -4,8 +4,10 @@ import com.google.gson.annotations.SerializedName import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass import java.util.* +@RealmClass(embedded = true) open class AuthenticationTimestamps : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Backer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Backer.kt index 9f98626f7..79a798293 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Backer.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Backer.kt @@ -2,7 +2,9 @@ package com.habitrpg.android.habitica.models.user import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Backer : RealmObject(), BaseObject { var id: String? = null var npc: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt index b7228d06d..e947524cc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt @@ -4,7 +4,9 @@ import com.google.gson.annotations.SerializedName import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Buffs : RealmObject(), BaseObject { @PrimaryKey var userId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.kt index 5be6cb99f..ee27a72e4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.kt @@ -6,7 +6,9 @@ import com.habitrpg.android.habitica.models.user.ContributorInfo import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.models.BaseObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class ContributorInfo : RealmObject(), BaseObject { companion object { val CONTRIBUTOR_COLOR_DICT: SparseIntArray = SparseIntArray() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/EmailNotificationsPreference.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/EmailNotificationsPreference.kt index 94b73fe64..348d935bd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/EmailNotificationsPreference.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/EmailNotificationsPreference.kt @@ -2,7 +2,9 @@ package com.habitrpg.android.habitica.models.user import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class EmailNotificationsPreference : RealmObject(), BaseObject { var unsubscribeFromAll: Boolean = false var invitedParty: Boolean = false diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt index 1bdf8ad3d..11a16d086 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt @@ -5,7 +5,9 @@ import com.habitrpg.android.habitica.models.TutorialStep import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Flags : RealmObject(), BaseObject { @PrimaryKey var userId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.kt index 03cc69c8e..368556360 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.kt @@ -5,7 +5,9 @@ import com.habitrpg.android.habitica.models.inventory.Equipment import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Gear : RealmObject(), BaseObject { @PrimaryKey var userId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt index 6b22e97c5..9e430f049 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt @@ -3,7 +3,9 @@ package com.habitrpg.android.habitica.models.user import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Hair : RealmObject, BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt index bd276cb78..021e52252 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt @@ -4,7 +4,9 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Inbox : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt index 8bb440a02..f395c3dff 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt @@ -4,8 +4,10 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass import java.util.* +@RealmClass(embedded = true) open class Items : RealmObject, BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt index 8cb095436..4b04e6402 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt @@ -7,7 +7,9 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Outfit : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedCustomization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedCustomization.kt index c3713096e..cf5417de3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedCustomization.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedCustomization.kt @@ -2,7 +2,9 @@ package com.habitrpg.android.habitica.models.user import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class OwnedCustomization : RealmObject(), OwnedObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt index 044fd61d6..bb9b29855 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt @@ -4,7 +4,9 @@ import com.habitrpg.android.habitica.models.BaseMainObject import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class OwnedItem : RealmObject(), BaseMainObject, OwnedObject { override val realmClass: Class diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt index b5908010c..05a054960 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt @@ -2,7 +2,9 @@ package com.habitrpg.android.habitica.models.user import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class OwnedMount : RealmObject(), OwnedObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedPet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedPet.kt index 5fa663ada..c73dacd2f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedPet.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedPet.kt @@ -2,8 +2,10 @@ package com.habitrpg.android.habitica.models.user import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class OwnedPet : RealmObject(), OwnedObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt index b34905dbb..2e834418b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt @@ -7,8 +7,10 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass import java.util.* +@RealmClass(embedded = true) open class Preferences : RealmObject(), AvatarPreferences, BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.kt index 0e80aa1ba..b8c467906 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.kt @@ -3,7 +3,9 @@ package com.habitrpg.android.habitica.models.user import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Profile : RealmObject, BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.kt index 6f6275231..e6e4ef004 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.kt @@ -4,7 +4,9 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Purchases : RealmObject(), BaseObject { @PrimaryKey var userId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt index 2afdcb8ff..f1f90026e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt @@ -2,7 +2,9 @@ package com.habitrpg.android.habitica.models.user import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class PushNotificationsPreference : RealmObject(), BaseObject { var unsubscribeFromAll: Boolean = false var invitedParty: Boolean = false diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.kt index 8f9b8407b..252225b83 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.kt @@ -5,7 +5,9 @@ import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class SpecialItems : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt index 94cb80969..c6b14d5f3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt @@ -6,8 +6,10 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Stats : RealmObject(), BaseObject { @PrimaryKey diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt index 9d91182af..95735f93f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt @@ -4,8 +4,10 @@ import com.google.gson.annotations.SerializedName import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass import java.util.* +@RealmClass(embedded = true) open class SubscriptionPlan : RealmObject(), BaseObject { @PrimaryKey var customerId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.kt index be911735a..6a7d2f2e2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.kt @@ -3,7 +3,9 @@ package com.habitrpg.android.habitica.models.user import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class SubscriptionPlanConsecutive : RealmObject(), BaseObject { @PrimaryKey var customerId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.kt index e9db582d5..5c12821e0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.kt @@ -3,7 +3,9 @@ package com.habitrpg.android.habitica.models.user import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class SuppressedModals : RealmObject(), BaseObject { @PrimaryKey var userId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt index 6129a63cb..bb3931680 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt @@ -4,7 +4,9 @@ import com.google.gson.annotations.SerializedName import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass +@RealmClass(embedded = true) open class Training : RealmObject(), BaseObject { @PrimaryKey var userId: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/UserAchievement.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/UserAchievement.kt index 732fa04dc..f7360c671 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/UserAchievement.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/UserAchievement.kt @@ -3,8 +3,10 @@ package com.habitrpg.android.habitica.models.user import com.habitrpg.android.habitica.models.BaseObject import io.realm.RealmObject import io.realm.annotations.PrimaryKey +import io.realm.annotations.RealmClass -open class UserAchievement() : RealmObject(), BaseObject { +@RealmClass(embedded = true) +open class UserAchievement : RealmObject(), BaseObject { @PrimaryKey var combinedKey: String? = null