gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 03:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2025-05-22 09:11:25 +02:00 committed by Marcel Hibbe
parent d159a577ba
commit f28bf02380
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
View File

@ -134,7 +134,6 @@ class ConversationInfoViewModel @Inject constructor(
val getProfileViewState: LiveData<ViewState> val getProfileViewState: LiveData<ViewState>
get() = _getProfileViewState get() = _getProfileViewState
private val _markConversationAsSensitiveResult = MutableLiveData<MarkConversationAsSensitiveViewState>(MarkConversationAsSensitiveViewState.None)
private val _markConversationAsSensitiveResult = private val _markConversationAsSensitiveResult =
MutableLiveData<MarkConversationAsSensitiveViewState>(MarkConversationAsSensitiveViewState.None) MutableLiveData<MarkConversationAsSensitiveViewState>(MarkConversationAsSensitiveViewState.None)
val markAsSensitiveResult: LiveData<MarkConversationAsSensitiveViewState> val markAsSensitiveResult: LiveData<MarkConversationAsSensitiveViewState>