From 8b2dc1686157311807113361f282384e58fe4a28 Mon Sep 17 00:00:00 2001 From: Philipp Heckel Date: Sat, 30 Oct 2021 08:57:20 -0400 Subject: [PATCH] Make baseUrl and topic unique --- app/src/main/java/io/heckel/ntfy/data/Database.kt | 2 +- app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/heckel/ntfy/data/Database.kt b/app/src/main/java/io/heckel/ntfy/data/Database.kt index ff5c440..9c8856c 100644 --- a/app/src/main/java/io/heckel/ntfy/data/Database.kt +++ b/app/src/main/java/io/heckel/ntfy/data/Database.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.room.* import kotlinx.coroutines.flow.Flow -@Entity +@Entity(indices = [Index(value = ["baseUrl", "topic"], unique = true)]) data class Subscription( @PrimaryKey val id: Long, // Internal ID, only used in Repository and activities @ColumnInfo(name = "baseUrl") val baseUrl: String, diff --git a/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt index 27fbfc0..11802b9 100644 --- a/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt +++ b/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt @@ -102,7 +102,7 @@ class MainActivity : AppCompatActivity(), AddFragment.AddSubscriptionListener { } override fun onSubscribe(topic: String, baseUrl: String) { - val subscription = Subscription(Random.nextLong(), topic, baseUrl, messages = 0) + val subscription = Subscription(id = Random.nextLong(), baseUrl = baseUrl, topic = topic, messages = 0) subscriptionsViewModel.add(subscription) FirebaseMessaging.getInstance().subscribeToTopic(topic) // FIXME ignores baseUrl }