Merge branch 'main' into bugfix/notification-strings

ls1intum · Oct 23, 2024 · fb4f9d1 · fb4f9d1
2 parents 3da1504 + 8e974f2
commit fb4f9d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/db/AppDatabase.kt b/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/db/AppDatabase.kt
@@ -29,7 +29,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.push.communication_not
         CommunicationMessageEntity::class
     ],
     exportSchema = true,
-    version = 9
+    version = 10,
 )
 @TypeConverters(RoomTypeConverters::class)
 abstract class AppDatabase : RoomDatabase() {

diff --git a/...mis/native_app/feature/metis/conversation/service/storage/impl/MetisStorageServiceImpl.kt b/...mis/native_app/feature/metis/conversation/service/storage/impl/MetisStorageServiceImpl.kt
@@ -513,7 +513,7 @@ internal class MetisStorageServiceImpl(
             )
 
             insertOrUpdateAnswerPost(
-                isNewPost = queryClientPostIdAnswer != null,
+                isNewPost = queryClientPostIdAnswer == null,
                 answerPostClientSidePostId = queryClientPostIdAnswer ?: UUID.randomUUID()
                     .toString(),
                 answerPost = ap,

diff --git a/...ain/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/shared/db/MetisDao.kt b/...ain/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/shared/db/MetisDao.kt
@@ -15,7 +15,6 @@ import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.db.entiti
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.db.entities.PostReactionEntity
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.db.entities.StandalonePostTagEntity
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.db.entities.StandalonePostingEntity
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.db.pojo.AnswerPostPojo
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.db.pojo.PostPojo
 import kotlinx.coroutines.flow.Flow
 import kotlinx.datetime.Instant
@@ -34,7 +33,8 @@ interface MetisDao {
     suspend fun clearAll(serverId: String)
 
     /**
-     * Query the client side post if for the given metis context. Returns null if the given post is not yet stored.
+     * Query the client side post id for the given server side post id.
+     * Returns null if the given post is not yet stored.
      * Note: Standalone posts and answer posts may have the same ids.
      */
     @Query(