Merge branch 'master' of gitlab.com:stax-river/poker-analytics

app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@@ -560,10 +560,14 @@ open class Session : RealmObject(), SessionInterface, Manageable, StaticRowRepre
 				NULL_TEXT
 			}
 			SessionRow.TOURNAMENT_FEATURE -> tournamentFeatures?.let {
+				if (it.size > 2) {
+					"${it.size}"
+				} else {
 					it.joinToString {feature ->
 						feature.name
 					}
 				}
+			}
 			SessionRow.TOURNAMENT_NAME -> tournamentName?.name ?: NULL_TEXT
 			else -> throw UnmanagedRowRepresentableException("Unmanaged row = ${row.getDisplayName()}")
 		}
@@ -802,6 +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 -> value?.let {
+				tournamentFeatures.add(value as TournamentFeature)
+			}
 		}
 		realm.commitTransaction()
 	}