Skip to content

Commit bd5cf0b

Browse files
authored
life: smoother submissions repository achievements upload managing (fixes #12243) (#12152)
1 parent 89daa17 commit bd5cf0b

4 files changed

Lines changed: 11 additions & 14 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 = 4990
16-
versionName = "0.49.90"
15+
versionCode = 4991
16+
versionName = "0.49.91"
1717
ndkVersion = '26.3.11579264'
1818
vectorDrawables.useSupportLibrary = true
1919
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,5 @@ interface UserRepository {
9999
suspend fun markUserKeyIvSaved(userId: String, key: String, iv: String?)
100100
suspend fun markUserRevUpdated(userId: String, rev: String?)
101101
suspend fun getAchievementData(userId: String, planetCode: String): AchievementData
102+
suspend fun getAchievementsForUpload(): List<JsonObject>
102103
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,4 +759,10 @@ class UserRepositoryImpl @Inject constructor(
759759
AchievementData()
760760
}
761761
}
762+
763+
override suspend fun getAchievementsForUpload(): List<JsonObject> {
764+
return queryList(RealmAchievement::class.java) {
765+
not().beginsWith("_id", "guest")
766+
}.map { RealmAchievement.serialize(it) }
767+
}
762768
}

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,8 @@ class UploadManager @Inject constructor(
201201
}
202202

203203
suspend fun uploadAchievement() {
204-
databaseService.executeTransactionAsync { transactionRealm ->
205-
val list: List<RealmAchievement> = transactionRealm.where(RealmAchievement::class.java).findAll()
206-
list.processInBatches { sub ->
207-
try {
208-
if (sub._id?.startsWith("guest") == true) {
209-
return@processInBatches
210-
}
211-
} catch (e: IOException) {
212-
e.printStackTrace()
213-
}
214-
}
215-
}
204+
val list = userRepository.getAchievementsForUpload()
205+
// TODO: Implement actual upload logic or track issue for missing implementation
216206
}
217207

218208
private suspend fun uploadCourseProgress() {

0 commit comments

Comments
 (0)