Fix SQLiteConstraintException when encryption is used

PrimalHQ · Nov 3, 2023 · a46232a · a46232a
1 parent 4bc4482
commit a46232a
Show file tree

Hide file tree

Showing 18 changed files with 59 additions and 39 deletions.
diff --git a/app/src/main/kotlin/net/primal/android/explore/db/TrendingHashtagDao.kt b/app/src/main/kotlin/net/primal/android/explore/db/TrendingHashtagDao.kt
@@ -1,14 +1,15 @@
 package net.primal.android.explore.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface TrendingHashtagDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<TrendingHashtag>)
 
     @Query("DELETE FROM TrendingHashtag")

diff --git a/app/src/main/kotlin/net/primal/android/feed/db/FeedDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/FeedDao.kt
@@ -1,14 +1,15 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface FeedDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<Feed>)
 
     @Query("SELECT * FROM Feed")

diff --git a/app/src/main/kotlin/net/primal/android/feed/db/FeedPostDataCrossRefDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/FeedPostDataCrossRefDao.kt
@@ -1,13 +1,14 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 
 @Dao
 interface FeedPostDataCrossRefDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun connect(data: List<FeedPostDataCrossRef>)
 
     @Query("DELETE FROM FeedPostDataCrossRef WHERE feedDirective = :feedDirective")

diff --git a/app/src/main/kotlin/net/primal/android/feed/db/FeedPostRemoteKeyDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/FeedPostRemoteKeyDao.kt
@@ -1,13 +1,14 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 
 @Dao
 interface FeedPostRemoteKeyDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsert(data: List<FeedPostRemoteKey>)
 
     @Query("SELECT * FROM FeedPostRemoteKey WHERE (eventId = :postId OR eventId = :repostId) AND directive = :directive")

diff --git a/app/src/main/kotlin/net/primal/android/feed/db/FeedPostSyncDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/FeedPostSyncDao.kt
@@ -1,14 +1,15 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface FeedPostSyncDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsert(data: FeedPostSync)
 
     @Query(

diff --git a/app/src/main/kotlin/net/primal/android/feed/db/MediaResourceDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/MediaResourceDao.kt
@@ -1,12 +1,13 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
-import androidx.room.Upsert
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 
 @Dao
 interface MediaResourceDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<MediaResource>)
 
 }
diff --git a/app/src/main/kotlin/net/primal/android/feed/db/NostrResourceDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/NostrResourceDao.kt
@@ -1,12 +1,13 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
-import androidx.room.Upsert
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 
 @Dao
 interface NostrResourceDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<NostrResource>)
 
 }
diff --git a/app/src/main/kotlin/net/primal/android/feed/db/PostDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/PostDao.kt
@@ -1,13 +1,14 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 
 @Dao
 interface PostDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<PostData>)
 
     @Query("DELETE FROM PostData WHERE postId NOT IN (SELECT DISTINCT postId FROM FeedPostDataCrossRef)")

diff --git a/app/src/main/kotlin/net/primal/android/feed/db/PostStatsDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/PostStatsDao.kt
@@ -1,15 +1,17 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
+
 @Dao
 interface PostStatsDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsert(data: PostStats)
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<PostStats>)
 
     @Query("SELECT * FROM PostStats WHERE postId = :postId")

diff --git a/app/src/main/kotlin/net/primal/android/feed/db/RepostDao.kt b/app/src/main/kotlin/net/primal/android/feed/db/RepostDao.kt
@@ -1,12 +1,13 @@
 package net.primal.android.feed.db
 
 import androidx.room.Dao
-import androidx.room.Upsert
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 
 @Dao
 interface RepostDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<RepostData>)
 
 }
diff --git a/app/src/main/kotlin/net/primal/android/messages/db/DirectMessageDao.kt b/app/src/main/kotlin/net/primal/android/messages/db/DirectMessageDao.kt
@@ -2,13 +2,14 @@ package net.primal.android.messages.db
 
 import androidx.paging.PagingSource
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 
 @Dao
 interface DirectMessageDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<DirectMessageData>)
 
     @Query("SELECT * FROM DirectMessageData ORDER BY createdAt DESC LIMIT 1")

diff --git a/app/src/main/kotlin/net/primal/android/messages/db/MessageConversationDao.kt b/app/src/main/kotlin/net/primal/android/messages/db/MessageConversationDao.kt
@@ -2,14 +2,15 @@ package net.primal.android.messages.db
 
 import androidx.paging.PagingSource
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 import net.primal.android.messages.domain.ConversationRelation
 
 @Dao
 interface MessageConversationDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<MessageConversationData>)
 
     @Query("SELECT * FROM MessageConversationData WHERE relation = :relation ORDER BY lastMessageAt DESC")

diff --git a/app/src/main/kotlin/net/primal/android/notifications/db/NotificationDao.kt b/app/src/main/kotlin/net/primal/android/notifications/db/NotificationDao.kt
@@ -2,9 +2,10 @@ package net.primal.android.notifications.db
 
 import androidx.paging.PagingSource
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -30,7 +31,7 @@ interface NotificationDao {
     @Query("UPDATE NotificationData SET seenGloballyAt = :seenAt WHERE seenGloballyAt IS NULL")
     fun markAllUnseenNotificationsAsSeen(seenAt: Long)
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<NotificationData>)
 
 }
diff --git a/app/src/main/kotlin/net/primal/android/profile/db/PostUserStatsDao.kt b/app/src/main/kotlin/net/primal/android/profile/db/PostUserStatsDao.kt
@@ -1,16 +1,17 @@
 package net.primal.android.profile.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 
 @Dao
 interface PostUserStatsDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsert(data: PostUserStats)
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<PostUserStats>)
 
     @Query("SELECT * FROM PostUserStats WHERE postId = :postId AND userId = :userId")

diff --git a/app/src/main/kotlin/net/primal/android/profile/db/ProfileDataDao.kt b/app/src/main/kotlin/net/primal/android/profile/db/ProfileDataDao.kt
@@ -1,15 +1,16 @@
 package net.primal.android.profile.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface ProfileDataDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<ProfileData>)
 
     @Transaction

diff --git a/app/src/main/kotlin/net/primal/android/profile/db/ProfileStatsDao.kt b/app/src/main/kotlin/net/primal/android/profile/db/ProfileStatsDao.kt
@@ -1,15 +1,16 @@
 package net.primal.android.profile.db
 
 import androidx.room.Dao
-import androidx.room.Upsert
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 
 @Dao
 interface ProfileStatsDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsert(data: ProfileStats)
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: List<ProfileStats>)
 
 }
diff --git a/app/src/main/kotlin/net/primal/android/settings/muted/db/MutedUserDao.kt b/app/src/main/kotlin/net/primal/android/settings/muted/db/MutedUserDao.kt
@@ -1,13 +1,15 @@
 package net.primal.android.settings.muted.db
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface MutedUserDao {
-    @Upsert
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun upsertAll(data: Set<MutedUserData>)
 
     @Query(

diff --git a/app/src/main/kotlin/net/primal/android/thread/db/ThreadConversationCrossRefDao.kt b/app/src/main/kotlin/net/primal/android/thread/db/ThreadConversationCrossRefDao.kt
@@ -1,12 +1,13 @@
 package net.primal.android.thread.db
 
 import androidx.room.Dao
-import androidx.room.Upsert
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 
 @Dao
 interface ThreadConversationCrossRefDao {
 
-    @Upsert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun connect(data: List<ThreadConversationCrossRef>)
 
 }