Skip to content

Commit 5e46a46

Browse files
committed
migrate SignalingMessageReceiver to kotlin
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent 9820c1e commit 5e46a46

5 files changed

Lines changed: 265 additions & 282 deletions

File tree

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,10 @@ class CallActivity : CallBaseActivity() {
291291
private var isBreakoutRoom = false
292292
private val localParticipantMessageListener = LocalParticipantMessageListener { token ->
293293
switchToRoomToken = token
294-
hangup(true, false)
294+
hangup(
295+
shutDownView = true,
296+
endCallForAll = false
297+
)
295298
}
296299
private val offerMessageListener = OfferMessageListener { sessionId, roomType, sdp, nick ->
297300
getOrCreatePeerConnectionWrapperForSessionIdAndType(
@@ -1973,7 +1976,7 @@ class CallActivity : CallBaseActivity() {
19731976

19741977
when (messageType) {
19751978
"usersInRoom" ->
1976-
internalSignalingMessageReceiver.process(signaling.messageWrapper as List<Map<String?, Any?>?>?)
1979+
internalSignalingMessageReceiver.process(signaling.messageWrapper as List<Map<String?, Any?>>)
19771980

19781981
"message" -> {
19791982
val ncSignalingMessage = LoganSquare.parse(
@@ -2789,11 +2792,11 @@ class CallActivity : CallBaseActivity() {
27892792
* All listeners are called in the main thread.
27902793
*/
27912794
private class InternalSignalingMessageReceiver : SignalingMessageReceiver() {
2792-
fun process(users: List<Map<String?, Any?>?>?) {
2795+
fun process(users: List<Map<String?, Any?>>) {
27932796
processUsersInRoom(users)
27942797
}
27952798

2796-
fun process(message: NCSignalingMessage?) {
2799+
fun process(message: NCSignalingMessage) {
27972800
processSignalingMessage(message)
27982801
}
27992802
}

app/src/main/java/com/nextcloud/talk/activities/ParticipantHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class ParticipantHandler(
139139
_uiState.update { it.copy(raisedHand = state) }
140140
}
141141

142-
override fun onReaction(reaction: String?) {
142+
override fun onReaction(reaction: String) {
143143
Log.d(TAG, "onReaction")
144144
}
145145

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -428,15 +428,15 @@ class ChatActivity :
428428

429429
var callStarted = false
430430

431-
private val localParticipantMessageListener = object : SignalingMessageReceiver.LocalParticipantMessageListener {
432-
override fun onSwitchTo(token: String?) {
433-
if (token != null) {
434-
if (CallActivity.active) {
435-
Log.d(TAG, "CallActivity is running. Ignore to switch chat in ChatActivity...")
436-
} else {
437-
switchToRoom(token, false, false)
438-
}
439-
}
431+
private val localParticipantMessageListener = SignalingMessageReceiver.LocalParticipantMessageListener { token ->
432+
if (CallActivity.active) {
433+
Log.d(TAG, "CallActivity is running. Ignore to switch chat in ChatActivity...")
434+
} else {
435+
switchToRoom(
436+
token = token,
437+
startCallAfterRoomSwitch = false,
438+
isVoiceOnlyCall = false
439+
)
440440
}
441441
}
442442

@@ -481,8 +481,8 @@ class ChatActivity :
481481
Log.d(
482482
TAG,
483483
"received message in ChatActivity. This is the chat message received via HPB. It would be " +
484-
"nicer to receive it in the ViewModel or Repository directly. Otherwise it needs to be passed into it" +
485-
" from here..."
484+
"nicer to receive it in the ViewModel or Repository directly. " +
485+
"Otherwise it needs to be passed into it from here..."
486486
)
487487
}
488488
}

0 commit comments

Comments
 (0)