mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-24 22:15:41 +03:00
ktlint format
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
parent
54b5fd5045
commit
6b32cb7e0b
4 changed files with 8 additions and 11 deletions
|
@ -1633,7 +1633,9 @@ class CallActivity : CallBaseActivity() {
|
|||
private fun callOrJoinRoomViaWebSocket() {
|
||||
if (hasExternalSignalingServer) {
|
||||
webSocketClient!!.joinRoomWithRoomTokenAndSession(
|
||||
roomToken!!, callSession, externalSignalingServer!!.federation
|
||||
roomToken!!,
|
||||
callSession,
|
||||
externalSignalingServer!!.federation
|
||||
)
|
||||
} else {
|
||||
performCall()
|
||||
|
|
|
@ -550,7 +550,6 @@ fun ConversationOptions(
|
|||
|
||||
@Composable
|
||||
fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: ConversationCreationViewModel) {
|
||||
|
||||
var password by remember { mutableStateOf("") }
|
||||
|
||||
AlertDialog(
|
||||
|
@ -583,10 +582,7 @@ fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: Con
|
|||
}
|
||||
|
||||
@Composable
|
||||
fun CreateConversation(
|
||||
conversationCreationViewModel: ConversationCreationViewModel,
|
||||
context: Context
|
||||
) {
|
||||
fun CreateConversation(conversationCreationViewModel: ConversationCreationViewModel, context: Context) {
|
||||
val selectedParticipants by conversationCreationViewModel.selectedParticipants.collectAsState()
|
||||
Box(
|
||||
modifier = Modifier
|
||||
|
|
|
@ -33,8 +33,7 @@ class ConversationCreationViewModel @Inject constructor(
|
|||
private val roomViewState = MutableStateFlow<RoomUIState>(RoomUIState.None)
|
||||
|
||||
private val selectedImageUri = MutableStateFlow<Uri?>(null)
|
||||
val selectedImageUriState:StateFlow<Uri?> = selectedImageUri
|
||||
|
||||
val selectedImageUriState: StateFlow<Uri?> = selectedImageUri
|
||||
|
||||
private val _currentUser = userManager.currentUser.blockingGet()
|
||||
val currentUser: User = _currentUser
|
||||
|
@ -43,7 +42,7 @@ class ConversationCreationViewModel @Inject constructor(
|
|||
_selectedParticipants.value = participants
|
||||
}
|
||||
|
||||
fun updateSelectedImageUri(uri:Uri?){
|
||||
fun updateSelectedImageUri(uri: Uri?) {
|
||||
selectedImageUri.value = uri
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue