Merge pull request #5227 from nextcloud/feature/5095/improveAccountDialogFragment

sowjanyakch · web-flow · commit abf571dddbbb · 2025-10-27T19:05:34.000+01:00
Improve AccountDialogFragment
diff --git a/app/src/androidTest/java/com/nextcloud/talk/ui/LoginIT.java b/app/src/androidTest/java/com/nextcloud/talk/ui/LoginIT.java
@@ -68,7 +68,6 @@ public void login() throws InterruptedException {
             try {
                 // Delete account if exists
                 onView(withId(R.id.switch_account_button)).perform(click());
-                onView(withId(R.id.manage_settings)).perform(click());
                 onView(withId(R.id.settings_remove_account)).perform(click());
                 onView(withText(R.string.nc_settings_remove)).perform(click());
                 // The remove button must be clicked two times
diff --git a/app/src/main/java/com/nextcloud/talk/account/data/model/AccountItem.kt b/app/src/main/java/com/nextcloud/talk/account/data/model/AccountItem.kt
@@ -0,0 +1,12 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Sowjanya Kota <sowjanya.kch@gmail.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package com.nextcloud.talk.account.data.model
+
+import com.nextcloud.talk.data.user.model.User
+
+data class AccountItem(val user: User, val userId: String?, val pendingInvitation: Int)
diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt b/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt
@@ -15,10 +15,12 @@ import com.nextcloud.talk.models.json.chat.ChatOverallSingleMessage
 import com.nextcloud.talk.models.json.conversations.RoomOverall
 import com.nextcloud.talk.models.json.conversations.RoomsOverall
 import com.nextcloud.talk.models.json.generic.GenericOverall
+import com.nextcloud.talk.models.json.invitation.InvitationOverall
 import com.nextcloud.talk.models.json.participants.AddParticipantOverall
 import com.nextcloud.talk.models.json.participants.TalkBan
 import com.nextcloud.talk.models.json.participants.TalkBanOverall
 import com.nextcloud.talk.models.json.profile.ProfileOverall
+import com.nextcloud.talk.models.json.status.StatusOverall
 import com.nextcloud.talk.models.json.testNotification.TestNotificationOverall
 import com.nextcloud.talk.models.json.threads.ThreadOverall
 import com.nextcloud.talk.models.json.threads.ThreadsOverall
@@ -315,4 +317,10 @@ interface NcApiCoroutines {
         @Url url: String,
         @Query("searchTerm") searchTerm: String?
     ): RoomsOverall
+
+    @GET
+    suspend fun getInvitations(@Header("Authorization") authorization: String, @Url url: String): InvitationOverall
+
+    @GET
+    suspend fun status(@Header("Authorization") authorization: String, @Url url: String): StatusOverall
 }
diff --git a/app/src/main/java/com/nextcloud/talk/chooseaccount/StatusRepository.kt b/app/src/main/java/com/nextcloud/talk/chooseaccount/StatusRepository.kt
@@ -0,0 +1,14 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Sowjanya Kota <sowjanya.kch@gmail.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package com.nextcloud.talk.chooseaccount
+
+import com.nextcloud.talk.models.json.status.StatusOverall
+
+interface StatusRepository {
+    suspend fun setStatus(): StatusOverall
+}
diff --git a/app/src/main/java/com/nextcloud/talk/chooseaccount/StatusRepositoryImplementation.kt b/app/src/main/java/com/nextcloud/talk/chooseaccount/StatusRepositoryImplementation.kt
@@ -0,0 +1,32 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Sowjanya Kota <sowjanya.kch@gmail.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package com.nextcloud.talk.chooseaccount
+
+import com.nextcloud.talk.api.NcApiCoroutines
+import com.nextcloud.talk.data.user.model.User
+import com.nextcloud.talk.models.json.status.StatusOverall
+import com.nextcloud.talk.utils.ApiUtils
+import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
+import javax.inject.Inject
+
+class StatusRepositoryImplementation @Inject constructor(
+    private val ncApiCoroutines: NcApiCoroutines,
+    private val currentUserProvider: CurrentUserProviderNew
+) : StatusRepository {
+    private val _currentUser = currentUserProvider.currentUser.blockingGet()
+    val currentUser: User = _currentUser
+    val credentials = ApiUtils.getCredentials(_currentUser.username, _currentUser.token)
+
+    override suspend fun setStatus(): StatusOverall {
+        val url = ApiUtils.getUrlForStatus(currentUser.baseUrl!!)
+        val statusOverall = credentials?.let {
+            ncApiCoroutines.status(credentials, url)
+        }
+        return statusOverall!!
+    }
+}
diff --git a/app/src/main/java/com/nextcloud/talk/chooseaccount/StatusViewModel.kt b/app/src/main/java/com/nextcloud/talk/chooseaccount/StatusViewModel.kt
@@ -0,0 +1,40 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Sowjanya Kota <sowjanya.kch@gmail.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package com.nextcloud.talk.chooseaccount
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.nextcloud.talk.models.json.status.StatusOverall
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class StatusViewModel @Inject constructor(private val repository: StatusRepository) : ViewModel() {
+
+    private val _statusViewState = MutableStateFlow<StatusUiState>(StatusUiState.None)
+    val statusViewState: StateFlow<StatusUiState> = _statusViewState
+
+    @Suppress("Detekt.TooGenericExceptionCaught")
+    fun getStatus() {
+        viewModelScope.launch {
+            try {
+                val status = repository.setStatus()
+                _statusViewState.value = StatusUiState.Success(status)
+            } catch (exception: Exception) {
+                _statusViewState.value = StatusUiState.Error(exception.message ?: "")
+            }
+        }
+    }
+}
+
+sealed class StatusUiState {
+    data object None : StatusUiState()
+    open class Success(val status: StatusOverall) : StatusUiState()
+    open class Error(val message: String) : StatusUiState()
+}
diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -38,6 +38,7 @@ import androidx.activity.OnBackPressedCallback
 import androidx.annotation.OptIn
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
@@ -112,7 +113,7 @@ import com.nextcloud.talk.repositories.unifiedsearch.UnifiedSearchRepository
 import com.nextcloud.talk.settings.SettingsActivity
 import com.nextcloud.talk.threadsoverview.ThreadsOverviewActivity
 import com.nextcloud.talk.ui.BackgroundVoiceMessageCard
-import com.nextcloud.talk.ui.dialog.ChooseAccountDialogFragment
+import com.nextcloud.talk.ui.dialog.ChooseAccountDialogCompose
 import com.nextcloud.talk.ui.dialog.ChooseAccountShareToDialogFragment
 import com.nextcloud.talk.ui.dialog.ConversationsListBottomDialog
 import com.nextcloud.talk.ui.dialog.FilterConversationFragment
@@ -824,6 +825,15 @@ class ConversationsListActivity :
         }
     }
 
+    private fun showChooseAccountDialog() {
+        binding.genericComposeView.apply {
+            val shouldDismiss = mutableStateOf(false)
+            setContent {
+                ChooseAccountDialogCompose().GetChooseAccountDialog(shouldDismiss, this@ConversationsListActivity)
+            }
+        }
+    }
+
     private fun loadUserAvatar(button: MaterialButton) {
         val target = object : Target {
             override fun onStart(placeholder: Drawable?) {
@@ -1175,8 +1185,7 @@ class ConversationsListActivity :
 
             if (resources!!.getBoolean(R.bool.multiaccount_support) && userManager.users.blockingGet().size > 1) {
                 dialogBuilder.setPositiveButton(R.string.nc_switch_account) { _, _ ->
-                    val newFragment: DialogFragment = ChooseAccountDialogFragment.newInstance()
-                    newFragment.show(supportFragmentManager, ChooseAccountDialogFragment.TAG)
+                    showChooseAccountDialog()
                 }
             }
 
@@ -1295,8 +1304,7 @@ class ConversationsListActivity :
 
         binding.switchAccountButton.setOnClickListener {
             if (resources != null && resources!!.getBoolean(R.bool.multiaccount_support)) {
-                val newFragment: DialogFragment = ChooseAccountDialogFragment.newInstance()
-                newFragment.show(supportFragmentManager, ChooseAccountDialogFragment.TAG)
+                showChooseAccountDialog()
             } else {
                 val intent = Intent(context, SettingsActivity::class.java)
                 startActivity(intent)
@@ -2068,8 +2076,7 @@ class ConversationsListActivity :
 
             if (resources!!.getBoolean(R.bool.multiaccount_support) && userManager.users.blockingGet().size > 1) {
                 dialogBuilder.setNegativeButton(R.string.nc_switch_account) { _, _ ->
-                    val newFragment: DialogFragment = ChooseAccountDialogFragment.newInstance()
-                    newFragment.show(supportFragmentManager, ChooseAccountDialogFragment.TAG)
+                    showChooseAccountDialog()
                 }
             }
 
@@ -2112,8 +2119,7 @@ class ConversationsListActivity :
 
             if (resources!!.getBoolean(R.bool.multiaccount_support) && userManager.users.blockingGet().size > 1) {
                 dialogBuilder.setNegativeButton(R.string.nc_switch_account) { _, _ ->
-                    val newFragment: DialogFragment = ChooseAccountDialogFragment.newInstance()
-                    newFragment.show(supportFragmentManager, ChooseAccountDialogFragment.TAG)
+                    showChooseAccountDialog()
                 }
             }
 
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt
@@ -19,6 +19,8 @@ import com.nextcloud.talk.chat.data.ChatMessageRepository
 import com.nextcloud.talk.chat.data.network.ChatNetworkDataSource
 import com.nextcloud.talk.chat.data.network.OfflineFirstChatRepository
 import com.nextcloud.talk.chat.data.network.RetrofitChatNetwork
+import com.nextcloud.talk.chooseaccount.StatusRepository
+import com.nextcloud.talk.chooseaccount.StatusRepositoryImplementation
 import com.nextcloud.talk.contacts.ContactsRepository
 import com.nextcloud.talk.contacts.ContactsRepositoryImpl
 import com.nextcloud.talk.conversationcreation.ConversationCreationRepository
@@ -147,7 +149,8 @@ class RepositoryModule {
     ): ConversationInfoEditRepository = ConversationInfoEditRepositoryImpl(ncApi, ncApiCoroutines, userProvider)
 
     @Provides
-    fun provideInvitationsRepository(ncApi: NcApi): InvitationsRepository = InvitationsRepositoryImpl(ncApi)
+    fun provideInvitationsRepository(ncApi: NcApi, ncApiCoroutines: NcApiCoroutines): InvitationsRepository =
+        InvitationsRepositoryImpl(ncApi, ncApiCoroutines)
 
     @Provides
     fun provideOfflineFirstChatRepository(
@@ -215,4 +218,10 @@ class RepositoryModule {
         networkLoginDataSource: NetworkLoginDataSource,
         localLoginDataSource: LocalLoginDataSource
     ): LoginRepository = LoginRepository(networkLoginDataSource, localLoginDataSource)
+
+    @Provides
+    fun provideStatusRepository(
+        ncApiCoroutines: NcApiCoroutines,
+        currentUserProviderNew: CurrentUserProviderNew
+    ): StatusRepository = StatusRepositoryImplementation(ncApiCoroutines, currentUserProviderNew)
 }
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt
@@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.nextcloud.talk.account.viewmodels.BrowserLoginActivityViewModel
 import com.nextcloud.talk.chat.viewmodels.ChatViewModel
 import com.nextcloud.talk.chat.viewmodels.MessageInputViewModel
+import com.nextcloud.talk.chooseaccount.StatusViewModel
 import com.nextcloud.talk.contacts.ContactsViewModel
 import com.nextcloud.talk.contextchat.ContextChatViewModel
 import com.nextcloud.talk.conversationcreation.ConversationCreationViewModel
@@ -172,4 +173,9 @@ abstract class ViewModelModule {
     @IntoMap
     @ViewModelKey(ContextChatViewModel::class)
     abstract fun contextChatViewModel(viewModel: ContextChatViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(StatusViewModel::class)
+    abstract fun statusRepositoryViewModel(viewModel: StatusViewModel): ViewModel
 }
diff --git a/app/src/main/java/com/nextcloud/talk/invitation/data/InvitationsRepository.kt b/app/src/main/java/com/nextcloud/talk/invitation/data/InvitationsRepository.kt
@@ -13,4 +13,5 @@ interface InvitationsRepository {
     fun fetchInvitations(user: User): Observable<InvitationsModel>
     fun acceptInvitation(user: User, invitation: Invitation): Observable<InvitationActionModel>
     fun rejectInvitation(user: User, invitation: Invitation): Observable<InvitationActionModel>
+    suspend fun getInvitations(user: User): InvitationsModel
 }
diff --git a/app/src/main/java/com/nextcloud/talk/invitation/data/InvitationsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/invitation/data/InvitationsRepositoryImpl.kt
@@ -7,11 +7,13 @@
 package com.nextcloud.talk.invitation.data
 
 import com.nextcloud.talk.api.NcApi
+import com.nextcloud.talk.api.NcApiCoroutines
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.utils.ApiUtils
 import io.reactivex.Observable
 
-class InvitationsRepositoryImpl(private val ncApi: NcApi) : InvitationsRepository {
+class InvitationsRepositoryImpl(private val ncApi: NcApi, private val ncApiCoroutines: NcApiCoroutines) :
+    InvitationsRepository {
 
     override fun fetchInvitations(user: User): Observable<InvitationsModel> {
         val credentials: String = ApiUtils.getCredentials(user.username, user.token)!!
@@ -40,6 +42,16 @@ class InvitationsRepositoryImpl(private val ncApi: NcApi) : InvitationsRepositor
         ).map { InvitationActionModel(ActionEnum.REJECT, it.ocs?.meta?.statusCode!!, invitation) }
     }
 
+    override suspend fun getInvitations(user: User): InvitationsModel {
+        val credentials: String = ApiUtils.getCredentials(user.username, user.token)!!
+
+        val invitationsOverall = ncApiCoroutines.getInvitations(
+            credentials,
+            ApiUtils.getUrlForInvitation(user.baseUrl!!)
+        )
+        return mapToInvitationsModel(user, invitationsOverall.ocs?.data!!)
+    }
+
     private fun mapToInvitationsModel(
         user: User,
         invitations: List<com.nextcloud.talk.models.json.invitation.Invitation>
diff --git a/app/src/main/java/com/nextcloud/talk/invitation/viewmodels/InvitationsViewModel.kt b/app/src/main/java/com/nextcloud/talk/invitation/viewmodels/InvitationsViewModel.kt
@@ -10,6 +10,7 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.invitation.data.ActionEnum
 import com.nextcloud.talk.invitation.data.Invitation
@@ -20,6 +21,9 @@ import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class InvitationsViewModel @Inject constructor(private val repository: InvitationsRepository) : ViewModel() {
@@ -35,6 +39,14 @@ class InvitationsViewModel @Inject constructor(private val repository: Invitatio
     val fetchInvitationsViewState: LiveData<ViewState>
         get() = _fetchInvitationsViewState
 
+    object GetInvitationsStartState : ViewState
+    object GetInvitationsEmptyState : ViewState
+    open class GetInvitationsErrorState(val error: Exception) : ViewState
+    open class GetInvitationsSuccessState(val invitations: List<Invitation>) : ViewState
+
+    private val _getInvitationsViewState = MutableStateFlow<ViewState>(GetInvitationsStartState)
+    val getInvitationsViewState: StateFlow<ViewState> = _getInvitationsViewState
+
     object InvitationActionStartState : ViewState
     object InvitationActionErrorState : ViewState
 
@@ -53,6 +65,22 @@ class InvitationsViewModel @Inject constructor(private val repository: Invitatio
             ?.subscribe(FetchInvitationsObserver())
     }
 
+    @Suppress("TooGenericExceptionCaught")
+    fun getInvitations(user: User) {
+        viewModelScope.launch {
+            try {
+                val invitationsModel = repository.getInvitations(user)
+                if (invitationsModel.invitations.isEmpty()) {
+                    _getInvitationsViewState.value = GetInvitationsEmptyState
+                } else {
+                    _getInvitationsViewState.value = GetInvitationsSuccessState(invitationsModel.invitations)
+                }
+            } catch (e: Exception) {
+                _getInvitationsViewState.value = GetInvitationsErrorState(e)
+            }
+        }
+    }
+
     fun acceptInvitation(user: User, invitation: Invitation) {
         repository.acceptInvitation(user, invitation)
             .subscribeOn(Schedulers.io())
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogCompose.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogCompose.kt
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
diff --git a/app/src/main/res/layout/dialog_choose_account.xml b/app/src/main/res/layout/dialog_choose_account.xml

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,5 @@ interface InvitationsRepository {`
`13`	`13`	`fun fetchInvitations(user: User): Observable<InvitationsModel>`
`14`	`14`	`fun acceptInvitation(user: User, invitation: Invitation): Observable<InvitationActionModel>`
`15`	`15`	`fun rejectInvitation(user: User, invitation: Invitation): Observable<InvitationActionModel>`
	`16`	`+ suspend fun getInvitations(user: User): InvitationsModel`
`16`	`17`	`}`