courses: smoother progress unique inserting (fixes #13014) (#13015)

Okuro3499 · dogi · web-flow · commit 24dc15f548f9 · 2026-04-19T23:59:13.000-04:00
Co-authored-by: dogi &lt;dogi@users.noreply.github.com&gt;
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 5337
-        versionName = "0.53.37"
+        versionCode = 5338
+        versionName = "0.53.38"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/src/main/java/org/ole/planet/myplanet/repository/ProgressRepositoryImpl.kt b/app/src/main/java/org/ole/planet/myplanet/repository/ProgressRepositoryImpl.kt
@@ -210,10 +210,12 @@ class ProgressRepositoryImpl @Inject constructor(
     }
 
     private fun insertCourseProgress(mRealm: Realm, act: JsonObject?) {
-        var courseProgress = mRealm.where(RealmCourseProgress::class.java).equalTo("_id", JsonUtils.getString("_id", act)).findFirst()
+        val docId = JsonUtils.getString("_id", act)
+        var courseProgress = mRealm.where(RealmCourseProgress::class.java).equalTo("id", docId).findFirst()
         if (courseProgress == null) {
-            courseProgress = mRealm.createObject(RealmCourseProgress::class.java, JsonUtils.getString("_id", act))
+            courseProgress = mRealm.createObject(RealmCourseProgress::class.java, docId)
         }
+        courseProgress?._id = docId
         courseProgress?._rev = JsonUtils.getString("_rev", act)
         courseProgress?.passed = JsonUtils.getBoolean("passed", act)
         courseProgress?.stepNum = JsonUtils.getInt("stepNum", act)

Original file line number	Diff line number	Diff line change
`@@ -210,10 +210,12 @@ class ProgressRepositoryImpl @Inject constructor(`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`private fun insertCourseProgress(mRealm: Realm, act: JsonObject?) {`
`213`		`- var courseProgress = mRealm.where(RealmCourseProgress::class.java).equalTo("_id", JsonUtils.getString("_id", act)).findFirst()`
	`213`	`+ val docId = JsonUtils.getString("_id", act)`
	`214`	`+ var courseProgress = mRealm.where(RealmCourseProgress::class.java).equalTo("id", docId).findFirst()`
`214`	`215`	`if (courseProgress == null) {`
`215`		`- courseProgress = mRealm.createObject(RealmCourseProgress::class.java, JsonUtils.getString("_id", act))`
	`216`	`+ courseProgress = mRealm.createObject(RealmCourseProgress::class.java, docId)`
`216`	`217`	`}`
	`218`	`+ courseProgress?._id = docId`
`217`	`219`	`courseProgress?._rev = JsonUtils.getString("_rev", act)`
`218`	`220`	`courseProgress?.passed = JsonUtils.getBoolean("passed", act)`
`219`	`221`	`courseProgress?.stepNum = JsonUtils.getInt("stepNum", act)`