From 4d52f794dcf60295c32a1f0a4dcab731a43058ee Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 22 Feb 2019 15:13:55 +0100 Subject: [PATCH] Finish merge --- .../java/net/pokeranalytics/android/model/realm/Session.kt | 7 ++++++- .../pokeranalytics/android/ui/fragment/HistoryFragment.kt | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index ae1cf2ad..e34e855d 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/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() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt index e43a9487..fac9aac3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt +++ b/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