Skip to content

sync: smoother manager user activities uploading (fixes #13088) #13021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dogi merged 4 commits into from
Apr 22, 2026
Merged

sync: smoother manager user activities uploading (fixes #13088) #13021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38905dc
⚡ Optimize network calls in user activities upload by using Coroutine…
dogi Apr 16, 2026
51abcd3
⚡ Optimize network calls in user activities upload by using bounded C…
dogi Apr 17, 2026
188ca86
Update version code and name in build.gradle
dogi Apr 22, 2026
b0abae8
Merge branch 'master' into jules-performance-upload-user-activities-1…
dogi Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdk = 26
targetSdk = 36
versionCode = 5362
versionName = "0.53.62"
versionCode = 5363
versionName = "0.53.63"
ndkVersion = '26.3.11579264'
vectorDrawables.useSupportLibrary = true
}
Expand Down
35 changes: 25 additions & 10 deletions app/src/main/java/org/ole/planet/myplanet/services/UploadManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ import java.io.IOException
import javax.inject.Inject
import javax.inject.Singleton
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.sync.withPermit
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.RequestBody.Companion.toRequestBody
import org.ole.planet.myplanet.MainApplication
Expand Down Expand Up @@ -456,16 +461,26 @@ class UploadManager @Inject constructor(
activitiesToUpload.chunked(BATCH_SIZE).forEach { batch ->
val successfulUpdates = mutableMapOf<String, com.google.gson.JsonObject?>()

batch.forEach { activityData ->
try {
val `object` = apiInterface.postDoc(
UrlUtils.header, "application/json",
"${UrlUtils.getUrl()}/login_activities", activityData.serialized
).body()

successfulUpdates[activityData.id] = `object`
} catch (e: java.io.IOException) {
Log.e(TAG, "Exception in UploadManager", e)
val semaphore = Semaphore(6)
coroutineScope {
val deferreds = batch.map { activityData ->
async {
try {
val `object` = semaphore.withPermit {
apiInterface.postDoc(
UrlUtils.header, "application/json",
"${UrlUtils.getUrl()}/login_activities", activityData.serialized
).body()
}
activityData.id to `object`
} catch (e: java.io.IOException) {
Log.e(TAG, "Exception in UploadManager", e)
null
}
}
}
deferreds.awaitAll().filterNotNull().forEach { (id, obj) ->
successfulUpdates[id] = obj
}
}

Expand Down
Loading