transaction update, logs

open-learning-exchange · Jul 24, 2024 · 51203f3 · 51203f3
1 parent 9c567c5
commit 51203f3
Show file tree

Hide file tree

Showing 4 changed files with 217 additions and 49 deletions.
diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.kt b/app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.kt
@@ -4,6 +4,7 @@ import android.content.Context.MODE_PRIVATE
 import android.content.SharedPreferences
 import android.text.TextUtils
 import android.util.Base64
+import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
@@ -80,10 +81,12 @@ open class RealmMyCourse : RealmObject() {
 
         @JvmStatic
         fun insertMyCourses(userId: String?, myCousesDoc: JsonObject?, mRealm: Realm) {
-            val settings: SharedPreferences = context.getSharedPreferences(PREFS_NAME, MODE_PRIVATE)
-            if (!mRealm.isInTransaction) {
-                mRealm.beginTransaction()
+            if(mRealm.isInTransaction) {
+                Log.e("RealmMyCourse", "insertMyCourses: Transaction is already in progress")
+            } else{
+                Log.e("RealmMyCourse", "insertMyCourses: Transaction is not in progress")
             }
+            val settings: SharedPreferences = context.getSharedPreferences(PREFS_NAME, MODE_PRIVATE)
             val id = JsonUtils.getString("_id", myCousesDoc)
             var myMyCoursesDB = mRealm.where(RealmMyCourse::class.java).equalTo("id", id).findFirst()
             if (myMyCoursesDB == null) {
@@ -131,16 +134,8 @@ open class RealmMyCourse : RealmObject() {
                 courseStepsList.add(step)
             }
 
-            if (mRealm.isInTransaction) {
-                mRealm.commitTransaction()
-            }
-
-            if (!mRealm.isInTransaction) {
-                mRealm.beginTransaction()
-            }
             myMyCoursesDB?.courseSteps = RealmList()
             myMyCoursesDB?.courseSteps?.addAll(courseStepsList)
-            mRealm.commitTransaction()
         }
 
         private fun extractLinks(text: String?): ArrayList<String> {
@@ -252,7 +247,11 @@ open class RealmMyCourse : RealmObject() {
 
         @JvmStatic
         fun insert(mRealm: Realm, myCousesDoc: JsonObject?) {
+            if (!mRealm.isInTransaction) {
+                mRealm.beginTransaction()
+            }
             insertMyCourses("", myCousesDoc, mRealm)
+            mRealm.commitTransaction()
         }
 
         @JvmStatic

diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmMyLibrary.kt b/app/src/main/java/org/ole/planet/myplanet/model/RealmMyLibrary.kt
@@ -3,6 +3,7 @@ package org.ole.planet.myplanet.model
 import android.content.Context
 import android.content.SharedPreferences
 import android.text.TextUtils
+import android.util.Log
 import com.google.gson.JsonArray
 import com.google.gson.JsonNull
 import com.google.gson.JsonObject
@@ -334,7 +335,11 @@ open class RealmMyLibrary : RealmObject() {
 
         @JvmStatic
         fun insertMyLibrary(userId: String?, doc: JsonObject, mRealm: Realm) {
+            if (!mRealm.isInTransaction) {
+                mRealm.beginTransaction()
+            }
             insertMyLibrary(userId, "", "", doc, mRealm)
+            mRealm.commitTransaction()
         }
 
         @JvmStatic
@@ -348,8 +353,10 @@ open class RealmMyLibrary : RealmObject() {
 
         @JvmStatic
         fun insertMyLibrary(userId: String?, stepId: String?, courseId: String?, doc: JsonObject, mRealm: Realm) {
-            if (!mRealm.isInTransaction) {
-                mRealm.beginTransaction()
+            if(mRealm.isInTransaction) {
+                Log.e("RealmMyLibrary", "insertMyLibrary: Transaction is already in progress")
+            } else{
+                Log.e("RealmMyLibrary", "insertMyLibrary: Transaction is not in progress")
             }
             val resourceId = JsonUtils.getString("_id", doc)
             val settings = MainApplication.context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
@@ -405,7 +412,6 @@ open class RealmMyLibrary : RealmObject() {
             resource?.setTag(JsonUtils.getJsonArray("tags", doc), resource)
             resource?.isPrivate = JsonUtils.getBoolean("private", doc)
             resource?.setLanguages(JsonUtils.getJsonArray("languages", doc), resource)
-            mRealm.commitTransaction()
         }
 
         @JvmStatic