From 4ff41f6391d24b2d956f6ddc1ecd26e27712d797 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 3 Mar 2020 11:07:18 +0100 Subject: [PATCH] Removes useless hands field from Session + fix build --- .../android/model/migrations/PokerAnalyticsMigration.kt | 5 +++-- .../java/net/pokeranalytics/android/model/realm/Session.kt | 5 ++++- .../pokeranalytics/android/ui/fragment/SessionFragment.kt | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt index 018fac38..51cc8a59 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt @@ -177,8 +177,9 @@ class PokerAnalyticsMigration : RealmMigration { if (currentVersion == 8) { schema.get("HandHistory")?.let { hhSchema -> - schema.get("Session")?.let { - hhSchema.addRealmObjectField("session", it) + schema.get("Session")?.let { sessionSchema -> + sessionSchema.removeField("hands") + hhSchema.addRealmObjectField("session", sessionSchema) } ?: throw PAIllegalStateException("Session schema not found") hhSchema.addField("smallBlind", Double::class.java) hhSchema.addField("bigBlind", Double::class.java) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 7ec574ea..543c2378 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -269,7 +269,10 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat var numberOfTables: Int = 1 // The hands list associated with the Session - var hands: RealmList = RealmList() +// var hands: RealmList = RealmList() + + @LinkingObjects("session") + val handHistories: RealmResults? = null // The list of opponents who participated to the session var opponents: RealmList = RealmList() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index dc029cff..0f3eddb4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -358,7 +358,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate { } private fun addHandHistory() { - HandHistoryActivity.newInstance(this, this.currentSession) + HandHistoryActivity.newInstance(this, this.currentSession, true) } /**