From 41de2d537023834b164bdf2f99d3ff514520d3eb Mon Sep 17 00:00:00 2001
From: Razmig Sarkissian <razmig@thomasbutton.com>
Date: Tue, 19 Mar 2019 10:31:33 +0100
Subject: [PATCH] update filter interface signature

---
 .../net/pokeranalytics/android/model/filter/DateFilterable.kt | 3 ++-
 .../net/pokeranalytics/android/model/filter/Filterable.kt     | 4 ++--
 .../pokeranalytics/android/model/filter/SessionFilterable.kt  | 3 ++-
 .../android/model/filter/interfaces/Filterable.kt             | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt
index 8d11541f..b2cad68a 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt
@@ -1,5 +1,6 @@
 package net.pokeranalytics.android.model.filter
 
+import io.realm.RealmObject
 import io.realm.RealmQuery
 import net.pokeranalytics.android.model.filter.interfaces.Filterable
 import java.util.*
@@ -37,7 +38,7 @@ enum class DateFilterable : Filterable {
             }
         }
 
-    override fun filter(realmQuery: RealmQuery<*>): RealmQuery<*> {
+    override fun filter(realmQuery: RealmQuery<out RealmObject>): RealmQuery<out RealmObject> {
         return when (this) {
             STARTED_FROM_DATE -> {
                 val date : Date by filterValues
diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt
index 36cf67bd..bfac5991 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt
@@ -34,9 +34,9 @@ import net.pokeranalytics.android.model.filter.interfaces.Filterable
 
 class FilterManager {
     fun filter(realm:Realm, relatedEntity: Class<out RealmObject>, queries:List<Filterable>): RealmResults<*> {
-        var realmQuery = realm.where(relatedEntity)
+        var realmQuery : RealmQuery<out RealmObject> = realm.where(relatedEntity)
         queries.forEach {
-            realmQuery = (it.filter(realmQuery) as RealmQuery<out RealmObject>).and()
+            realmQuery = (it.filter(realmQuery)).and()
         }
         return realmQuery.findAll()
     }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt
index bc4e452a..332a8c0c 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt
@@ -1,5 +1,6 @@
 package net.pokeranalytics.android.model.filter
 
+import io.realm.RealmObject
 import io.realm.RealmQuery
 import net.pokeranalytics.android.exceptions.FilterValueMapException
 import net.pokeranalytics.android.model.filter.interfaces.Filterable
@@ -53,7 +54,7 @@ enum class SessionFilterable: Filterable {
             }
         }
 
-    override fun filter(realmQuery: RealmQuery<*>): RealmQuery<*> {
+    override fun filter(realmQuery: RealmQuery<out RealmObject>): RealmQuery<out RealmObject> {
         return when (this) {
             LIVE -> realmQuery.equalTo(Field.LIVE.fieldName, true)
             CASH -> realmQuery.equalTo(Field.CASH.fieldName, Session.Type.CASH_GAME.ordinal)
diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/Filterable.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/Filterable.kt
index ca5ed70c..509ee118 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/Filterable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/Filterable.kt
@@ -1,7 +1,8 @@
 package net.pokeranalytics.android.model.filter.interfaces
 
+import io.realm.RealmObject
 import io.realm.RealmQuery
 
 interface Filterable : ValueFilterable {
-    fun filter(realmQuery: RealmQuery<*>): RealmQuery<*>
+    fun filter(realmQuery: RealmQuery<out RealmObject>): RealmQuery<out RealmObject>
 }