diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index 6d4f240f..f1a07f24 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -54,7 +54,7 @@ class PokerAnalyticsApplication : Application() { Realm.init(this) val realmConfiguration = RealmConfiguration.Builder() .name(Realm.DEFAULT_REALM_NAME) - .schemaVersion(15) + .schemaVersion(14) // .allowWritesOnUiThread(true) .migration(PokerAnalyticsMigration()) .initialData(Seed(this)) 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 9ed55aab..93f7d03c 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 @@ -335,19 +335,6 @@ class PokerAnalyticsMigration : RealmMigration { currentVersion++ } - // Migrate to version 15 - if (currentVersion == 14) { -// schema.get("ComputableResult")?.let { crs -> -// crs.addField("id", String::class.java).setRequired("id", true) -// crs.addPrimaryKey("id") -// } - schema.get("Result")?.let { crs -> - crs.addField("id", String::class.java).setRequired("id", true) - crs.addPrimaryKey("id") - } - currentVersion++ - } - } override fun equals(other: Any?): Boolean { diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt index facf5f5a..f0875e48 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt @@ -4,12 +4,10 @@ import io.realm.RealmList import io.realm.RealmObject import io.realm.RealmResults import io.realm.annotations.LinkingObjects -import io.realm.annotations.PrimaryKey import io.realm.annotations.RealmClass import net.pokeranalytics.android.exceptions.PADataModelException import net.pokeranalytics.android.model.filter.Filterable import net.pokeranalytics.android.model.filter.QueryCondition -import java.util.* @RealmClass open class Result : RealmObject(), Filterable { @@ -25,8 +23,8 @@ open class Result : RealmObject(), Filterable { } - @PrimaryKey - var id = UUID.randomUUID().toString() +// @PrimaryKey +// var id = UUID.randomUUID().toString() /** * The buyin amount