gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

ktlint format

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2024-09-19 14:57:12 +02:00 committed by Marcel Hibbe
parent 4dd22d6223
commit 384ba6945f
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View File

@ -1633,7 +1633,9 @@ class CallActivity : CallBaseActivity() {
private fun callOrJoinRoomViaWebSocket() { private fun callOrJoinRoomViaWebSocket() {
if (hasExternalSignalingServer) { if (hasExternalSignalingServer) {
webSocketClient!!.joinRoomWithRoomTokenAndSession( webSocketClient!!.joinRoomWithRoomTokenAndSession(
roomToken!!, callSession, externalSignalingServer!!.federation roomToken!!,
callSession,
externalSignalingServer!!.federation
) )
} else { } else {
performCall() performCall()

2
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -3240,7 +3240,7 @@ class ChatActivity :
val lon = data["longitude"]!! val lon = data["longitude"]!!
metaData = metaData =
"{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," + "{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," +
"\"longitude\":\"$lon\",\"name\":\"$name\"}" "\"longitude\":\"$lon\",\"name\":\"$name\"}"
} }
when (type) { when (type) {

8
app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
View File

@ -138,7 +138,7 @@ fun ConversationCreationScreen(
context: Context, context: Context,
pickImage: PickImage pickImage: PickImage
) { ) {
val selectedImageUri = conversationCreationViewModel.selectedImageUriState.collectAsState().value val selectedImageUri = conversationCreationViewModel.selectedImageUriState.collectAsState().value
val imagePickerLauncher = rememberLauncherForActivityResult( val imagePickerLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.StartActivityForResult() contract = ActivityResultContracts.StartActivityForResult()
@ -550,7 +550,6 @@ fun ConversationOptions(
@Composable @Composable
fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: ConversationCreationViewModel) { fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: ConversationCreationViewModel) {
var password by remember { mutableStateOf("") } var password by remember { mutableStateOf("") }
AlertDialog( AlertDialog(
@ -583,10 +582,7 @@ fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: Con
} }
@Composable @Composable
fun CreateConversation( fun CreateConversation(conversationCreationViewModel: ConversationCreationViewModel, context: Context) {
conversationCreationViewModel: ConversationCreationViewModel,
context: Context
) {
val selectedParticipants by conversationCreationViewModel.selectedParticipants.collectAsState() val selectedParticipants by conversationCreationViewModel.selectedParticipants.collectAsState()
Box( Box(
modifier = Modifier modifier = Modifier

5
app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt
View File

@ -33,8 +33,7 @@ class ConversationCreationViewModel @Inject constructor(
private val roomViewState = MutableStateFlow<RoomUIState>(RoomUIState.None) private val roomViewState = MutableStateFlow<RoomUIState>(RoomUIState.None)
private val selectedImageUri = MutableStateFlow<Uri?>(null) private val selectedImageUri = MutableStateFlow<Uri?>(null)
val selectedImageUriState:StateFlow<Uri?> = selectedImageUri val selectedImageUriState: StateFlow<Uri?> = selectedImageUri
private val _currentUser = userManager.currentUser.blockingGet() private val _currentUser = userManager.currentUser.blockingGet()
val currentUser: User = _currentUser val currentUser: User = _currentUser
@ -43,7 +42,7 @@ class ConversationCreationViewModel @Inject constructor(
_selectedParticipants.value = participants _selectedParticipants.value = participants
} }
fun updateSelectedImageUri(uri:Uri?){ fun updateSelectedImageUri(uri: Uri?) {
selectedImageUri.value = uri selectedImageUri.value = uri
} }