diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt index 9d6830c08..965ece66d 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt @@ -106,7 +106,7 @@ class GroupConversationView : BaseView() { override fun onFloatingActionButtonClick() { view?.conversationNameInputEditText?.text?.let { conversationName -> - val conversationType = if (view?.allowGuestsSwitchMaterial?.isChecked == true) 2 else 3 + val conversationType = if (view?.allowGuestsSwitchMaterial?.isChecked == true) 3 else 2 viewModel.createConversation(conversationType, conversationName.toString(), view?.passwordInputEditText?.text?.toString()) } } diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt index 82d6241ac..3f9c8db7f 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt @@ -54,7 +54,7 @@ class GroupConversationViewModel constructor( createConversationUseCase.invoke(viewModelScope, parametersOf(globalService.currentUserLiveData.value, conversationType, null, null, conversationName), object : UseCaseResponse { override suspend fun onSuccess(result: ConversationOverall) { result.ocs.data.token?.let { token -> - if (conversationPassword != null) { + if (!conversationPassword.isNullOrEmpty()) { setPasswordForConversation(token, conversationPassword) } else { _operationState.postValue(ContactsViewOperationStateWrapper(ContactsViewOperationState.OK, null, token)) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 37d9a8c76..1ddd96bde 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -56,7 +56,8 @@ android:layout_height="32dp" android:layout_gravity="center_vertical|end" android:layout_marginEnd="8dp" - android:indeterminateTint="@color/hwSecurityRed" + android:visibility="gone" + android:indeterminateTint="@color/white" android:scaleType="fitCenter" /> diff --git a/app/src/main/res/layout/new_group_conversation_view.xml b/app/src/main/res/layout/new_group_conversation_view.xml index d42037362..de21079db 100644 --- a/app/src/main/res/layout/new_group_conversation_view.xml +++ b/app/src/main/res/layout/new_group_conversation_view.xml @@ -23,6 +23,7 @@