Skip to content

Commit e6c54f7

Browse files
authored
teams: smoother voices repository uploading (fixes #12925) (#12874)
1 parent a927ede commit e6c54f7

5 files changed

Lines changed: 6 additions & 16 deletions

File tree

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
applicationId "org.ole.planet.myplanet"
1313
minSdk = 26
1414
targetSdk = 36
15-
versionCode = 5295
16-
versionName = "0.52.95"
15+
versionCode = 5296
16+
versionName = "0.52.96"
1717
ndkVersion = '26.3.11579264'
1818
vectorDrawables.useSupportLibrary = true
1919
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ data class NewsUpdateData(
2323
)
2424

2525
interface VoicesRepository {
26-
suspend fun getNewsForUpload(serializeNews: (RealmNews) -> JsonObject): List<NewsUploadData>
26+
suspend fun getNewsForUpload(): List<NewsUploadData>
2727
suspend fun markNewsUploaded(updates: List<NewsUpdateData>)
2828
suspend fun getLibraryResource(resourceId: String): RealmMyLibrary?
2929
suspend fun getCommunityNews(userIdentifier: String): Flow<List<RealmNews>>
@@ -50,6 +50,5 @@ interface VoicesRepository {
5050
suspend fun getPlanetNewsMessages(planetCode: String?): List<RealmNews>
5151
suspend fun insertNewsFromJson(doc: com.google.gson.JsonObject)
5252
suspend fun insertNewsList(docs: List<com.google.gson.JsonObject>)
53-
fun serializeNews(news: RealmNews): com.google.gson.JsonObject
5453
fun bulkInsertFromSync(realm: io.realm.Realm, jsonArray: com.google.gson.JsonArray)
5554
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class VoicesRepositoryImpl @Inject constructor(
3636
) : RealmRepository(databaseService, realmDispatcher), VoicesRepository {
3737
private val concatenatedLinks = ArrayList<String>()
3838

39-
override suspend fun getNewsForUpload(serializeNews: (RealmNews) -> JsonObject): List<NewsUploadData> {
39+
override suspend fun getNewsForUpload(): List<NewsUploadData> {
4040
return withRealm { realm ->
4141
realm.where(RealmNews::class.java)
4242
.findAll()
@@ -570,7 +570,7 @@ class VoicesRepositoryImpl @Inject constructor(
570570
news?.sharedBy = JsonUtils.getString("sharedBy", newsObj)
571571
}
572572

573-
override fun serializeNews(news: RealmNews): JsonObject {
573+
private fun serializeNews(news: RealmNews): JsonObject {
574574
val `object` = JsonObject()
575575
`object`.addProperty("chat", news.chat)
576576
`object`.addProperty("message", news.message)

app/src/main/java/org/ole/planet/myplanet/services/UploadManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ class UploadManager @Inject constructor(
497497
// standard UploadCoordinator pattern, so we handle it with custom logic but still use
498498
// the coordinator for the core upload/update flow where possible.
499499
val user = userRepository.getUserModelSuspending()
500-
val newsItems = voicesRepository.getNewsForUpload { voicesRepository.serializeNews(it) }
500+
val newsItems = voicesRepository.getNewsForUpload()
501501

502502
withContext(dispatcherProvider.io) {
503503
newsItems.chunked(BATCH_SIZE).forEach { batch ->

app/src/main/java/org/ole/planet/myplanet/services/upload/UploadConfigs.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,4 @@ class UploadConfigs @Inject constructor(
241241
rating.isUpdated = false
242242
}
243243
)
244-
245-
val News = UploadConfig(
246-
modelClass = RealmNews::class,
247-
endpoint = "news",
248-
queryBuilder = { query -> query }, // Upload all news items
249-
serializer = UploadSerializer.Simple(voicesRepository::serializeNews),
250-
idExtractor = { it.id },
251-
dbIdExtractor = { it._id } // Enables POST/PUT logic
252-
)
253244
}

0 commit comments

Comments
 (0)