From 04458065d5188836ea5dab03eba497db59866251 Mon Sep 17 00:00:00 2001
From: Razmig Sarkissian <razmig@thomasbutton.com>
Date: Fri, 19 Apr 2019 16:10:52 +0200
Subject: [PATCH] some clean up

---
 .../model/migrations/PokerAnalyticsMigration.kt   |  1 +
 .../pokeranalytics/android/model/realm/Filter.kt  |  7 -------
 .../ui/view/rowrepresentable/FilterElementRow.kt  | 15 ---------------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
index 8336fd41..7bce2eec 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
@@ -38,6 +38,7 @@ class PokerAnalyticsMigration : RealmMigration {
 			schema.rename("FilterElement", "FilterCondition")
 			schema.get("Filter")?.let {
 				it.renameField("filterElements", "filterConditions")
+                it.removeField("entityType")
 			}
 			schema.get("SessionSet")?.let {
 				it.addField("id", String::class.java).setRequired("id", true)
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
index 106831ba..06e91e6d 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
@@ -20,13 +20,6 @@ import java.util.*
  */
 open class Filter : RealmObject() {
 
-	private var entityType: Int? = Entity.SESSION.ordinal
-
-	private enum class Entity {
-		SESSION,
-		;
-	}
-
 	companion object {
 
 		// Create a new instance
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
index f0a5f15b..013e1b34 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
@@ -1,30 +1,15 @@
 package net.pokeranalytics.android.ui.view.rowrepresentable
 
-import android.content.Context
 import android.text.InputType
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.filter.QueryCondition
-import net.pokeranalytics.android.model.realm.FilterCondition
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowViewType
-import java.text.DateFormatSymbols
 import java.util.*
 
 interface FilterElementRow : RowRepresentable {
-    fun contains(filterConditions: List<FilterCondition>): Boolean {
-        return when (this) {
-            is QueryCondition.StaticDataQueryCondition -> filterConditions.any {
-                it.intValues.contains(this.intValues.first())
-            }
-            is QueryCondition.QueryDataCondition<*>-> filterConditions.any {
-                it.ids.contains(this.dataObject?.id)
-            }
-            else -> true
-        }
-    }
-
     override val resId: Int?
         get() {
             return when (this) {