fix git conflicts

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/build.gradle

@@ -122,7 +122,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation 'androidx.fragment:fragment:1.8.5'
+    implementation 'androidx.fragment:fragment:1.8.6'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
@@ -139,7 +139,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.11.0'
 
     // Gson
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.12.1'
 
     // ReactiveX
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'

app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt

@@ -2,15 +2,15 @@ package it.niedermann.owncloud.notes.persistence.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import it.niedermann.owncloud.notes.persistence.entity.ShareEntity
 
 @Dao
 interface ShareDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun addShareEntities(entities: List<ShareEntity>)
 
-    @Insert
-    fun addShareEntity(entity: ShareEntity)
-
-    @Query("SELECT * FROM share_table WHERE noteRemoteId = :noteRemoteId AND userName = :userName")
-    fun getShareEntities(noteRemoteId: Long, userName: String): List<ShareEntity>
+    @Query("SELECT * FROM share_table WHERE path = :path")
+    fun getShareEntities(path: String): List<ShareEntity>
 }