Fix set initial profile data on edit profile

app/src/main/java/org/futo/circles/feature/settings/profile/edit/EditProfileDialogFragment.kt

@@ -63,7 +63,7 @@ class EditProfileDialogFragment :
             }
         )
         viewModel.profileLiveData.observeData(this) {
-            it.getOrNull()?.let { user -> setInitialUserInfo(user) }
+            it?.let { user -> setInitialUserInfo(user) }
         }
         viewModel.threePidLiveData.observeData(this) {
             binding.tilContactInfo.editText?.setText(it.firstOrNull()?.value ?: "")

app/src/main/java/org/futo/circles/feature/settings/profile/edit/EditProfileViewModel.kt

@@ -7,6 +7,8 @@ import org.futo.circles.auth.feature.sign_up.setup_profile.SetupProfileDataSourc
 import org.futo.circles.core.SingleEventLiveData
 import org.futo.circles.core.extensions.Response
 import org.futo.circles.core.extensions.launchBg
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.user.model.User
 
 class EditProfileViewModel(
     private val dataSource: SetupProfileDataSource
@@ -14,8 +16,12 @@ class EditProfileViewModel(
 
     val selectedImageLiveData = MutableLiveData<Uri>()
     val editProfileResponseLiveData = SingleEventLiveData<Response<Unit?>>()
-    val profileLiveData = dataSource.profileLiveData
-    val threePidLiveData = dataSource.threePidLiveData
+    val profileLiveData = SingleEventLiveData<User?>().apply {
+        postValue(dataSource.getUserData())
+    }
+    val threePidLiveData = SingleEventLiveData<List<ThreePid>>().apply {
+        postValue(dataSource.getThreePidData())
+    }
     val isProfileDataChangedLiveData = MutableLiveData(false)
 
     fun setImageUri(uri: Uri) {

auth/src/main/java/org/futo/circles/auth/feature/sign_up/setup_profile/SetupProfileDataSource.kt

@@ -18,8 +18,9 @@ class SetupProfileDataSource(
         )
     }
 
-    val profileLiveData = session.userService().getUserLive(session.myUserId)
-    val threePidLiveData = session.profileService().getThreePidsLive(true)
+    fun getUserData() = session.userService().getUser(session.myUserId)
+
+    fun getThreePidData() = session.profileService().getThreePids()
 
     suspend fun saveProfileData(profileImageUri: Uri?, displayName: String?) = createResult {
         profileImageUri?.let { uri ->