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

app/src/androidTest/java/net/pokeranalytics/android/unitTests/FavoriteSessionUnitTest.kt

@@ -9,6 +9,7 @@ import net.pokeranalytics.android.model.utils.FavoriteSessionFinder
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.*
 
 @RunWith(AndroidJUnit4::class)
 
@@ -25,6 +26,10 @@ class FavoriteSessionUnitTest : RealmInstrumentedUnitTest() {
         val s2 = newSessionInstance(realm)
         val s3 = newSessionInstance(realm)
 
+        s1.endDate = Date()
+        s2.endDate = Date()
+        s3.endDate = Date()
+
         s1.cgBigBlind = 4.0
         s2.cgBigBlind = 4.0
         s3.cgBigBlind = 1.0

app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt

@@ -26,22 +26,22 @@ fun Session.parameterRepresentation(context: Context): String {
  */
 private fun Session.significantFields(): List<SessionRow> {
 	when (this.type) {
-		Session.Type.CASH_GAME.ordinal -> {
+		Session.Type.TOURNAMENT.ordinal -> {
 			return listOf(
 				SessionRow.GAME,
 				SessionRow.INITIAL_BUY_IN,
 				SessionRow.BANKROLL,
 				SessionRow.TABLE_SIZE,
-				SessionRow.TOURNAMENT_NAME
+				SessionRow.TOURNAMENT_NAME,
+				SessionRow.TOURNAMENT_TYPE
 			)
 		}
-		Session.Type.TOURNAMENT.ordinal -> {
+		Session.Type.CASH_GAME.ordinal -> {
 			return listOf(
 				SessionRow.GAME,
 				SessionRow.BLINDS,
 				SessionRow.BANKROLL,
-				SessionRow.TABLE_SIZE,
-				SessionRow.TOURNAMENT_TYPE
+				SessionRow.TABLE_SIZE
 			)
 		}
 	}