gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-26 14:15:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conversation creation & password set

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-30 22:17:25 +01:00
parent 1c3792bc21
commit ebec4c547e
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt
View File

@ -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())
}
}

2
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt
View File

@ -54,7 +54,7 @@ class GroupConversationViewModel constructor(
createConversationUseCase.invoke(viewModelScope, parametersOf(globalService.currentUserLiveData.value, conversationType, null, null, conversationName), object : UseCaseResponse<ConversationOverall> {
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))

3
app/src/main/res/layout/activity_main.xml
View File

@ -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" />
</com.google.android.material.appbar.MaterialToolbar>

5
app/src/main/res/layout/new_group_conversation_view.xml
View File

@ -23,6 +23,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:animateLayoutChanges="true">
<RelativeLayout
@ -33,6 +34,7 @@
android:id="@+id/conversationNameTextInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:endIconMode="clear_text"
android:hint="@string/nc_call_name">
<com.google.android.material.textfield.TextInputEditText
@ -45,6 +47,7 @@
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/allowGuestsSwitchMaterial"
android:layout_width="match_parent"
app:useMaterialThemeColors="true"
android:layout_height="wrap_content"
android:layout_below="@id/conversationNameTextInputLayout"
android:layout_marginHorizontal="8dp"
@ -57,6 +60,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/allowGuestsSwitchMaterial"
android:visibility="gone"
app:endIconMode="password_toggle"
android:hint="@string/nc_password_optional">
<com.google.android.material.textfield.TextInputEditText
@ -64,6 +68,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="8dp"
android:inputType="textPassword"
android:layout_marginBottom="8dp" />
</com.google.android.material.textfield.TextInputLayout>
</RelativeLayout>