Finish merge

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

@@ -8,6 +8,7 @@ import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.SessionInterface
 import net.pokeranalytics.android.model.LiveData
+import net.pokeranalytics.android.model.ObjectSavable
 import net.pokeranalytics.android.model.extensions.SessionState
 import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
@@ -24,7 +25,11 @@ import java.util.*
 import kotlin.collections.ArrayList
 
 open class Session : RealmObject(), SessionInterface, RowRepresentableDataSource,
-	RowEditable, RowRepresentable {
+	RowEditable, RowRepresentable, ObjectSavable {
+
+	override fun uniqueIdentifier(): String {
+		return id
+	}
 
 	@PrimaryKey
 	var id = UUID.randomUUID().toString()

app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt

@@ -12,7 +12,6 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.ObjectSavable
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.activity.SessionActivity
-import net.pokeranalytics.android.ui.adapter.HistoryAdapter
 import net.pokeranalytics.android.ui.adapter.components.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDelegate