teams: smoother voices reply realm handling (fixes #8964) (#8970)

Co-authored-by: dogi <[email protected]>

Author: Sakshamnayyar

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 3705
-        versionName = "0.37.5"
+        versionCode = 3706
+        versionName = "0.37.6"
         ndkVersion = '26.3.11579264'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/org/ole/planet/myplanet/repository/NewsRepositoryImpl.kt

@@ -7,6 +7,7 @@ import io.realm.Sort
 import java.util.HashMap
 import javax.inject.Inject
 import org.ole.planet.myplanet.datamanager.DatabaseService
+import org.ole.planet.myplanet.datamanager.findCopyByField
 import org.ole.planet.myplanet.model.RealmNews
 import org.ole.planet.myplanet.model.RealmNews.Companion.createNews
 import org.ole.planet.myplanet.model.RealmUserModel
@@ -17,12 +18,15 @@ class NewsRepositoryImpl @Inject constructor(
 ) : RealmRepository(databaseService), NewsRepository {
 
     override suspend fun getNewsWithReplies(newsId: String): Pair<RealmNews?, List<RealmNews>> {
-        val news = findByField(RealmNews::class.java, "id", newsId)
-        val replies = queryList(RealmNews::class.java) {
-            equalTo("replyTo", newsId, Case.INSENSITIVE)
-            sort("time", Sort.DESCENDING)
+        return withRealm(ensureLatest = true) { realm ->
+            val news = realm.findCopyByField(RealmNews::class.java, "id", newsId)
+            val replies = realm.where(RealmNews::class.java)
+                .equalTo("replyTo", newsId, Case.INSENSITIVE)
+                .sort("time", Sort.DESCENDING)
+                .findAll()
+                .let { realm.copyFromRealm(it) }
+            news to replies
         }
-        return news to replies
     }
 
     override suspend fun getCommunityVisibleNews(userIdentifier: String): List<RealmNews> {

app/src/main/java/org/ole/planet/myplanet/repository/RealmRepository.kt

@@ -18,16 +18,28 @@ open class RealmRepository(private val databaseService: DatabaseService) {
     protected suspend fun <T : RealmObject> queryList(
         clazz: Class<T>,
         builder: RealmQuery<T>.() -> Unit = {},
+    ): List<T> = queryList(clazz, false, builder)
+
+    protected suspend fun <T : RealmObject> queryList(
+        clazz: Class<T>,
+        ensureLatest: Boolean,
+        builder: RealmQuery<T>.() -> Unit = {},
     ): List<T> =
-        databaseService.withRealmAsync { realm ->
+        withRealm(ensureLatest) { realm ->
             realm.queryList(clazz, builder)
         }
 
     protected suspend fun <T : RealmObject> count(
         clazz: Class<T>,
         builder: RealmQuery<T>.() -> Unit = {},
+    ): Long = count(clazz, false, builder)
+
+    protected suspend fun <T : RealmObject> count(
+        clazz: Class<T>,
+        ensureLatest: Boolean,
+        builder: RealmQuery<T>.() -> Unit = {},
     ): Long =
-        databaseService.withRealmAsync { realm ->
+        withRealm(ensureLatest) { realm ->
             realm.where(clazz).apply(builder).count()
         }
 
@@ -54,8 +66,15 @@ open class RealmRepository(private val databaseService: DatabaseService) {
         clazz: Class<T>,
         fieldName: String,
         value: V,
+    ): T? = findByField(clazz, fieldName, value, false)
+
+    protected suspend fun <T : RealmObject, V : Any> findByField(
+        clazz: Class<T>,
+        fieldName: String,
+        value: V,
+        ensureLatest: Boolean,
     ): T? =
-        databaseService.withRealmAsync { realm ->
+        withRealm(ensureLatest) { realm ->
             realm.findCopyByField(clazz, fieldName, value)
         }
 
@@ -90,8 +109,20 @@ open class RealmRepository(private val databaseService: DatabaseService) {
         }
     }
 
+    protected suspend fun <T> withRealm(
+        ensureLatest: Boolean = false,
+        operation: (Realm) -> T,
+    ): T {
+        return databaseService.withRealmAsync { realm ->
+            if (ensureLatest) {
+                realm.refresh()
+            }
+            operation(realm)
+        }
+    }
+
     protected suspend fun <T> withRealmAsync(operation: (Realm) -> T): T {
-        return databaseService.withRealmAsync(operation)
+        return withRealm(false, operation)
     }
 
     protected fun <T> withRealmFlow(