sync: smoother user profile realm handling (fixes #8999) (#9004)

Co-authored-by: dogi <[email protected]>

Author: Okuro3499

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 3714
-        versionName = "0.37.14"
+        versionCode = 3715
+        versionName = "0.37.15"
         ndkVersion = '26.3.11579264'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/org/ole/planet/myplanet/service/UserProfileDbHandler.kt

@@ -70,7 +70,7 @@ class UserProfileDbHandler @Inject constructor(
                 val parentCode = model?.parentCode
                 val planetCode = model?.planetCode
 
-                realmService.withRealmAsync { realm ->
+                realmService.executeTransactionAsync { realm ->
                     val offlineActivities = realm.createObject(RealmOfflineActivity::class.java, UUID.randomUUID().toString())
                     offlineActivities.userId = userId
                     offlineActivities.userName = userName
@@ -96,7 +96,7 @@ class UserProfileDbHandler @Inject constructor(
     fun logoutAsync() {
         GlobalScope.launch(Dispatchers.IO) {
             try {
-                realmService.withRealmAsync { realm ->
+                realmService.executeTransactionAsync { realm ->
                     RealmOfflineActivity.getRecentLogin(realm)
                         ?.logoutTime = Date().time
                 }
@@ -145,6 +145,9 @@ class UserProfileDbHandler @Inject constructor(
     }
 
     fun setResourceOpenCount(item: RealmMyLibrary, type: String?) {
+        val itemTitle = item.title
+        val itemResourceId = item.resourceId
+
         GlobalScope.launch(Dispatchers.IO) {
             try {
                 val model = getUserModelCopy()
@@ -155,10 +158,8 @@ class UserProfileDbHandler @Inject constructor(
                 val userName = model?.name
                 val parentCode = model?.parentCode
                 val planetCode = model?.planetCode
-                val itemTitle = item.title
-                val itemResourceId = item.resourceId
 
-                realmService.withRealmAsync { realm ->
+                realmService.executeTransactionAsync { realm ->
                     val offlineActivities = realm.createObject(RealmResourceActivity::class.java, "${UUID.randomUUID()}")
                     offlineActivities.user = userName
                     offlineActivities.parentCode = parentCode

app/src/main/java/org/ole/planet/myplanet/ui/sync/LoginActivity.kt

@@ -173,7 +173,9 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
                     binding.inputPassword.error = getString(R.string.err_msg_password)
                 } else {
                     val enterUserName = binding.inputName.text.toString().trimEnd()
-                    val user = mRealm.where(RealmUserModel::class.java).equalTo("name", enterUserName).findFirst()
+                    val user = databaseService.withRealm { realm ->
+                        realm.where(RealmUserModel::class.java).equalTo("name", enterUserName).findFirst()?.let { realm.copyFromRealm(it) }
+                    }
                     if (user == null || !user.isArchived) {
                         submitForm(enterUserName, binding.inputPassword.text.toString())
                     } else {
@@ -287,8 +289,10 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
     }
 
     fun updateTeamDropdown() {
-        val teams: List<RealmMyTeam>? = mRealm.where(RealmMyTeam::class.java)
-            ?.isEmpty("teamId")?.equalTo("status", "active")?.findAll()
+        val teams: List<RealmMyTeam>? = databaseService.withRealm { realm ->
+            realm.where(RealmMyTeam::class.java)
+                .isEmpty("teamId").equalTo("status", "active").findAll()?.let { realm.copyFromRealm(it) }
+        }
 
         if (!teams.isNullOrEmpty()) {
             binding.team.visibility = View.VISIBLE
@@ -407,7 +411,9 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
     fun getTeamMembers() {
         selectedTeamId = prefData.getSelectedTeamId().toString()
         if (selectedTeamId?.isNotEmpty() == true) {
-            users = RealmMyTeam.getUsers(selectedTeamId, mRealm, "membership")
+            users = databaseService.withRealm { realm ->
+                RealmMyTeam.getUsers(selectedTeamId, realm, "membership").map { realm.copyFromRealm(it) }.toMutableList()
+            }
             val userList = (users as? MutableList<RealmUserModel>)?.map {
                 User(it.name ?: "", it.name ?: "", "", it.userImage ?: "", "team")
             } ?: emptyList()
@@ -444,7 +450,9 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
             binding.inputName.setText(user.name)
         } else {
             if (user.source == "guest"){
-                val model = RealmUserModel.createGuestUser(user.name, mRealm, settings)?.let { mRealm.copyFromRealm(it) }
+                val model = databaseService.withRealm { realm ->
+                    RealmUserModel.createGuestUser(user.name, realm, settings)?.let { realm.copyFromRealm(it) }
+                }
                 if (model == null) {
                     toast(this, getString(R.string.unable_to_login))
                 } else {
@@ -469,7 +477,9 @@ class LoginActivity : SyncActivity(), TeamListAdapter.OnItemClickListener {
         builder.setNegativeButton("cancel") { dialog: DialogInterface, _: Int -> dialog.dismiss() }
         builder.setPositiveButton("continue") { dialog: DialogInterface, _: Int ->
             dialog.dismiss()
-            val model = RealmUserModel.createGuestUser(username, mRealm, settings)?.let { mRealm.copyFromRealm(it) }
+            val model = databaseService.withRealm { realm ->
+                RealmUserModel.createGuestUser(username, realm, settings)?.let { realm.copyFromRealm(it) }
+            }
             if (model == null) {
                 toast(this, getString(R.string.unable_to_login))
             } else {

app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt

@@ -357,7 +357,8 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers
             if (settings != null) {
                 this.settings = settings
             }
-            if (mRealm.isEmpty) {
+            val isEmpty = databaseService.withRealm { realm -> realm.isEmpty }
+            if (isEmpty) {
                 alertDialogOkay(getString(R.string.server_not_configured_properly_connect_this_device_with_planet_server))
                 false
             } else {
@@ -371,7 +372,9 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers
 
     private fun checkName(username: String?, password: String?, isManagerMode: Boolean): Boolean {
         try {
-            val user = mRealm.where(RealmUserModel::class.java).equalTo("name", username).findFirst()
+            val user = databaseService.withRealm { realm ->
+                realm.where(RealmUserModel::class.java).equalTo("name", username).findFirst()?.let { realm.copyFromRealm(it) }
+            }
             user?.let {
                 if (it._id?.isEmpty() == true) {
                     if (username == it.name && password == it.password) {
@@ -765,7 +768,9 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers
                 continueSyncProcess()
             }
         } else {
-            mRealm.executeTransactionAsync { realm: Realm -> realm.deleteAll() }
+            lifecycleScope.launch(Dispatchers.IO) {
+                databaseService.executeTransactionAsync { realm -> realm.deleteAll() }
+            }
         }
         builder.setCancelable(cancelable)
         builder.show()