Skip to content

Commit

Permalink
ktlint format
Browse files Browse the repository at this point in the history
Signed-off-by: sowjanyakch <[email protected]>
  • Loading branch information
sowjanyakch committed Sep 19, 2024
1 parent b80c44a commit 38e07e0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1633,7 +1633,9 @@ class CallActivity : CallBaseActivity() {
private fun callOrJoinRoomViaWebSocket() {
if (hasExternalSignalingServer) {
webSocketClient!!.joinRoomWithRoomTokenAndSession(
roomToken!!, callSession, externalSignalingServer!!.federation
roomToken!!,
callSession,
externalSignalingServer!!.federation
)
} else {
performCall()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3241,7 +3241,7 @@ class ChatActivity :
val lon = data["longitude"]!!
metaData =
"{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," +
"\"longitude\":\"$lon\",\"name\":\"$name\"}"
"\"longitude\":\"$lon\",\"name\":\"$name\"}"
}

when (type) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ fun ConversationCreationScreen(
context: Context,
pickImage: PickImage
) {
val selectedImageUri = conversationCreationViewModel.selectedImageUriState.collectAsState().value
val selectedImageUri = conversationCreationViewModel.selectedImageUriState.collectAsState().value

val imagePickerLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.StartActivityForResult()
Expand Down Expand Up @@ -550,7 +550,6 @@ fun ConversationOptions(

@Composable
fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: ConversationCreationViewModel) {

var password by remember { mutableStateOf("") }

AlertDialog(
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,7 +42,7 @@ class ConversationCreationViewModel @Inject constructor(
_selectedParticipants.value = participants
}

fun updateSelectedImageUri(uri:Uri?){
fun updateSelectedImageUri(uri: Uri?) {
selectedImageUri.value = uri
}

Expand Down

0 comments on commit 38e07e0

Please sign in to comment.