all: smoother user repository creating (fixes #11277) (#11251)

Author: dogi

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 4605
-        versionName = "0.46.5"
+        versionCode = 4606
+        versionName = "0.46.6"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/org/ole/planet/myplanet/data/DataService.kt

@@ -192,30 +192,6 @@ class DataService constructor(
         }
     }
 
-    fun becomeMember(obj: JsonObject, callback: CreateUserCallback, securityCallback: OnSecurityDataListener? = null) {
-        serviceScope.launch {
-            val result = userRepository.becomeMember(obj)
-            withContext(Dispatchers.Main) {
-                if (result.first) {
-                    if (context is ProcessUserDataActivity) {
-                        val userName = obj["name"].asString
-                        context.startUpload("becomeMember", userName, securityCallback)
-                    }
-
-                    if (result.second == context.getString(R.string.not_connect_to_planet_created_user_offline)) {
-                        Utilities.toast(MainApplication.context, result.second)
-                        securityCallback?.onSecurityDataUpdated()
-                    }
-
-                    callback.onSuccess(result.second)
-                } else {
-                    callback.onSuccess(result.second)
-                    securityCallback?.onSecurityDataUpdated()
-                }
-            }
-        }
-    }
-
     suspend fun syncPlanetServers(callback: OnSuccessListener) {
         try {
             val response = withContext(Dispatchers.IO) {
@@ -357,10 +333,6 @@ class DataService constructor(
         fun onError(msg: String, blockSync: Boolean)
     }
 
-    interface CreateUserCallback {
-        fun onSuccess(message: String)
-    }
-
     interface ConfigurationIdListener {
         fun onConfigurationIdReceived(id: String, code: String, url: String, defaultUrl: String, isAlternativeUrl: Boolean, callerActivity: String)
     }

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

@@ -59,6 +59,8 @@ interface UserRepository {
 
     suspend fun becomeMember(obj: JsonObject): Pair<Boolean, String>
 
+    suspend fun createMember(userJson: JsonObject): Result<String>
+
     suspend fun searchUsers(query: String, sortField: String, sortOrder: Sort): List<RealmUser>
     suspend fun getHealthRecordsAndAssociatedUsers(
         userId: String,

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

@@ -323,6 +323,15 @@ class UserRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun createMember(userJson: JsonObject): Result<String> {
+        val (isSuccess, message) = becomeMember(userJson)
+        return if (isSuccess) {
+            Result.success(message)
+        } else {
+            Result.failure(Exception(message))
+        }
+    }
+
     private suspend fun uploadToShelf(obj: JsonObject) {
         try {
             val url = UrlUtils.getUrl() + "/shelf/org.couchdb.user:" + obj["name"].asString

app/src/main/java/org/ole/planet/myplanet/ui/user/BecomeMemberActivity.kt

@@ -19,7 +19,6 @@ import org.ole.planet.myplanet.MainApplication
 import org.ole.planet.myplanet.R
 import org.ole.planet.myplanet.base.BaseActivity
 import org.ole.planet.myplanet.callback.OnSecurityDataListener
-import org.ole.planet.myplanet.data.DataService
 import org.ole.planet.myplanet.databinding.ActivityBecomeMemberBinding
 import org.ole.planet.myplanet.ui.sync.LoginActivity
 import org.ole.planet.myplanet.utils.Constants.PREFS_NAME
@@ -143,18 +142,32 @@ class BecomeMemberActivity : BaseActivity() {
             show()
         }
 
-        DataService(this).becomeMember(obj, object : DataService.CreateUserCallback {
-            override fun onSuccess(success: String) {
-                runOnUiThread { Utilities.toast(this@BecomeMemberActivity, success) }
-            }
-        }, object : OnSecurityDataListener {
-            override fun onSecurityDataUpdated() {
-                runOnUiThread {
+        lifecycleScope.launch {
+            val result = userRepository.createMember(obj)
+            withContext(Dispatchers.Main) {
+                result.onSuccess { message ->
+                    Utilities.toast(this@BecomeMemberActivity, message)
+                    if (message == getString(R.string.not_connect_to_planet_created_user_offline)) {
+                        customProgressDialog.dismiss()
+                        autoLoginNewMember(info.username, info.password)
+                    } else {
+                        startUpload("becomeMember", info.username, object : OnSecurityDataListener {
+                            override fun onSecurityDataUpdated() {
+                                runOnUiThread {
+                                    customProgressDialog.dismiss()
+                                    autoLoginNewMember(info.username, info.password)
+                                }
+                            }
+                        })
+                    }
+                }.onFailure { exception ->
+                    val message = exception.message ?: ""
+                    Utilities.toast(this@BecomeMemberActivity, message)
                     customProgressDialog.dismiss()
                     autoLoginNewMember(info.username, info.password)
                 }
             }
-        })
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {