From 0c0e403acc6dede7e3acba75b2aa187102dc3016 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Tue, 3 Sep 2024 11:21:24 +0200 Subject: [PATCH] Work on ktlint warnings Signed-off-by: sowjanyakch --- .../talk/contacts/ContactsActivityCompose.kt | 3 +- .../talk/contacts/ContactsViewModel.kt | 7 ++--- .../ConversationCreationViewModel.kt | 28 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt index 5fd1edb2842..cc037413497 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt @@ -106,7 +106,8 @@ class ContactsActivityCompose : BaseActivity() { val uiState = contactsViewModel.contactsViewState.collectAsState() val selectedParticipants = remember { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - intent.getParcelableArrayListExtra("selectedParticipants", AutocompleteUser::class.java) ?: emptyList() + intent.getParcelableArrayListExtra("selectedParticipants", AutocompleteUser::class.java) + ?: emptyList() } else { @Suppress("DEPRECATION") intent.getParcelableArrayListExtra("selectedParticipants") ?: emptyList() diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsViewModel.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsViewModel.kt index 3c2e6dcc477..7dda6759137 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsViewModel.kt @@ -30,8 +30,8 @@ class ContactsViewModel @Inject constructor( val shareTypeList: List = shareTypes private val _searchState = MutableStateFlow(false) val searchState: StateFlow = _searchState - private val _selectedParticipants = MutableStateFlow>(emptyList()) - val selectedParticipantsList: StateFlow> = _selectedParticipants + private val selectedParticipants = MutableStateFlow>(emptyList()) + val selectedParticipantsList: StateFlow> = selectedParticipants private val _isAddParticipantsView = MutableStateFlow(false) val isAddParticipantsView: StateFlow = _isAddParticipantsView @@ -44,7 +44,7 @@ class ContactsViewModel @Inject constructor( } fun updateSelectedParticipants(participants: List) { - _selectedParticipants.value = participants + selectedParticipants.value = participants } fun updateSearchState(searchState: Boolean) { _searchState.value = searchState @@ -107,4 +107,3 @@ sealed class RoomUiState { data class Success(val conversation: Conversation?) : RoomUiState() data class Error(val message: String) : RoomUiState() } - diff --git a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt index d9c7846a4e7..2ee9276c2d9 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt @@ -25,7 +25,7 @@ class ConversationCreationViewModel @Inject constructor( ) : ViewModel() { private val _selectedParticipants = MutableStateFlow>(emptyList()) val selectedParticipants: StateFlow> = _selectedParticipants - private val _roomViewState = MutableStateFlow(RoomUIState.None) + private val roomViewState = MutableStateFlow(RoomUIState.None) fun updateSelectedParticipants(participants: List) { _selectedParticipants.value = participants @@ -41,7 +41,7 @@ class ConversationCreationViewModel @Inject constructor( var isConversationAvailableForRegisteredUsers = mutableStateOf(false) var openForGuestAppUsers = mutableStateOf(false) private val addParticipantsViewState = MutableStateFlow(AddParticipantsUiState.None) - private val _allowGuestsResult = MutableStateFlow(AllowGuestsUiState.None) + private val allowGuestsResult = MutableStateFlow(AllowGuestsUiState.None) fun updateRoomName(roomName: String) { _roomName.value = roomName } @@ -66,7 +66,7 @@ class ConversationCreationViewModel @Inject constructor( else -> 0 } viewModelScope.launch { - _roomViewState.value = RoomUIState.None + roomViewState.value = RoomUIState.None try { val roomResult = repository.createRoom(roomType, conversationName) val conversation = roomResult.ocs?.data @@ -75,15 +75,15 @@ class ConversationCreationViewModel @Inject constructor( val token = conversation.token if (token != null) { try { - repository.setConversationDescription( + repository.setConversationDescription( token, _conversationDescription.value ) - val allowGuestsResult = repository.allowGuests(token, isGuestsAllowed.value) - val statusCode: GenericMeta? = allowGuestsResult.ocs?.meta + val allowGuestResultOverall = repository.allowGuests(token, isGuestsAllowed.value) + val statusCode: GenericMeta? = allowGuestResultOverall.ocs?.meta val result = (statusCode?.statusCode == STATUS_CODE_OK) if (result) { - _allowGuestsResult.value = AllowGuestsUiState.Success(result) + allowGuestsResult.value = AllowGuestsUiState.Success(result) for (participant in participants) { if (participant.id != null) { val participantOverall = repository.addParticipants( @@ -100,15 +100,15 @@ class ConversationCreationViewModel @Inject constructor( repository.openConversation(token, scope) onRoomCreated(token) } catch (exception: Exception) { - _allowGuestsResult.value = AllowGuestsUiState.Error(exception.message ?: "") + allowGuestsResult.value = AllowGuestsUiState.Error(exception.message ?: "") } } - _roomViewState.value = RoomUIState.Success(conversation) + roomViewState.value = RoomUIState.Success(conversation) } else { - _roomViewState.value = RoomUIState.Error("Conversation is null") + roomViewState.value = RoomUIState.Error("Conversation is null") } } catch (e: Exception) { - _roomViewState.value = RoomUIState.Error(e.message ?: "Unknown error") + roomViewState.value = RoomUIState.Error(e.message ?: "Unknown error") Log.e("ConversationCreationViewModel", "Error - ${e.message}") } } @@ -127,9 +127,9 @@ class ConversationCreationViewModel @Inject constructor( ) val conversation: Conversation? = room.ocs?.data - _roomViewState.value = RoomUIState.Success(conversation) + roomViewState.value = RoomUIState.Success(conversation) } catch (exception: Exception) { - _roomViewState.value = RoomUIState.Error(exception.message ?: "") + roomViewState.value = RoomUIState.Error(exception.message ?: "") } } } @@ -146,7 +146,7 @@ sealed class RoomUIState { data class Error(val message: String) : RoomUIState() } -sealed class AddParticipantsUiState{ +sealed class AddParticipantsUiState { data object None : AddParticipantsUiState() data class Success(val participants: List?) : AddParticipantsUiState() data class Error(val message: String) : AddParticipantsUiState()