From 4d7565263789711704c540bc5dab0afcb5085b4e Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 11 Mar 2019 10:41:32 +0100 Subject: [PATCH 1/2] update tournament feature --- .../net/pokeranalytics/android/model/realm/Session.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 d0337432..6c1fb8f7 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 @@ -557,8 +557,12 @@ open class Session : RealmObject(), SessionInterface, Manageable, StaticRowRepre NULL_TEXT } SessionRow.TOURNAMENT_FEATURE -> tournamentFeatures?.let { - it.joinToString {feature -> - feature.name + if (it.size > 2) { + "${it.size}" + } else { + it.joinToString {feature -> + feature.name + } } } SessionRow.TOURNAMENT_NAME -> tournamentName?.name ?: NULL_TEXT @@ -796,6 +800,7 @@ open class Session : RealmObject(), SessionInterface, Manageable, StaticRowRepre } SessionRow.TOURNAMENT_NAME -> tournamentName = value as TournamentName? SessionRow.TOURNAMENT_TYPE -> tournamentType = value as Int? + SessionRow.TOURNAMENT_FEATURE -> tournamentFeatures = value as RealmList } realm.commitTransaction() } From 14b9ae4a01fcfd1f4e20903f2a6235257350b0f3 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 11 Mar 2019 10:54:45 +0100 Subject: [PATCH 2/2] tournament feature --- .../java/net/pokeranalytics/android/model/realm/Session.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 54afae8b..ef86acee 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 @@ -806,7 +806,9 @@ open class Session : RealmObject(), SessionInterface, Manageable, StaticRowRepre } SessionRow.TOURNAMENT_NAME -> tournamentName = value as TournamentName? SessionRow.TOURNAMENT_TYPE -> tournamentType = value as Int? - SessionRow.TOURNAMENT_FEATURE -> tournamentFeatures = value as RealmList + SessionRow.TOURNAMENT_FEATURE -> value?.let { + tournamentFeatures.add(value as TournamentFeature) + } } realm.commitTransaction() }