From 9024f379043bfca19c628fe505c3fc99535d9431 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 7 Mar 2019 10:20:51 +0100 Subject: [PATCH 1/2] Fix warnings --- .../android/model/utils/FavoriteSessionFinder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt b/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt index 3a156a62..2dc4a7d8 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt @@ -101,7 +101,7 @@ class FavoriteSessionFinder { */ private fun favoriteSession(sessionType: Int, location: Location?, realm: Realm, context: Context) : Session? { - var lastSessionsQuery = realm.where(Session::class.java).equalTo("type", sessionType) + val lastSessionsQuery = realm.where(Session::class.java).equalTo("type", sessionType) if (location != null) { lastSessionsQuery.equalTo("location.id", location.id) } @@ -110,7 +110,7 @@ class FavoriteSessionFinder { .limit(FAVORITE_SIGNIFICANT_SESSIONS) .findAll() - var counters= hashMapOf() + val counters= hashMapOf() lastSessions.forEach { session -> val representation = session.parameterRepresentation(context) val counter = counters[representation] From ed15e7e9e8c3957088878f9eeec07f7ee5866a61 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 7 Mar 2019 10:35:47 +0100 Subject: [PATCH 2/2] Stats: only take finished sessions into account --- .../android/ui/fragment/components/SessionObserverFragment.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/SessionObserverFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/SessionObserverFragment.kt index c3513e9d..0f5bd592 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/SessionObserverFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/SessionObserverFragment.kt @@ -10,14 +10,14 @@ open class SessionObserverFragment : PokerAnalyticsFragment() { init { val realm = Realm.getDefaultInstance() - this.sessions = realm.where(Session::class.java).findAll() + this.sessions = realm.where(Session::class.java).isNotNull("timeFrame.endDate").findAll() this.sessions.addChangeListener { _, _ -> this.sessionsChanged() } } open fun sessionsChanged() { - + // to override } } \ No newline at end of file