gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-22 04:05:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2710 from nextcloud/bugfix/noid/avoidNpeWhenAnswerCall

Browse Source 
avoid crash when answering call
This commit is contained in:
Marcel Hibbe 2023-01-20 09:42:51 +01:00 committed by GitHub
commit c17657ab8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt
View File

@ -153,25 +153,29 @@ class CallNotificationActivity : CallBaseActivity() {
} }
private fun proceedToCall() { private fun proceedToCall() {
originalBundle!!.putString(KEY_ROOM_TOKEN, currentConversation!!.token) if (currentConversation != null) {
originalBundle!!.putString(KEY_CONVERSATION_NAME, currentConversation!!.displayName) originalBundle!!.putString(KEY_ROOM_TOKEN, currentConversation!!.token)
originalBundle!!.putString(KEY_CONVERSATION_NAME, currentConversation!!.displayName)
val participantPermission = ParticipantPermissions( val participantPermission = ParticipantPermissions(
userBeingCalled!!, userBeingCalled!!,
currentConversation!! currentConversation!!
) )
originalBundle!!.putBoolean( originalBundle!!.putBoolean(
BundleKeys.KEY_PARTICIPANT_PERMISSION_CAN_PUBLISH_AUDIO, BundleKeys.KEY_PARTICIPANT_PERMISSION_CAN_PUBLISH_AUDIO,
participantPermission.canPublishAudio() participantPermission.canPublishAudio()
) )
originalBundle!!.putBoolean( originalBundle!!.putBoolean(
BundleKeys.KEY_PARTICIPANT_PERMISSION_CAN_PUBLISH_VIDEO, BundleKeys.KEY_PARTICIPANT_PERMISSION_CAN_PUBLISH_VIDEO,
participantPermission.canPublishVideo() participantPermission.canPublishVideo()
) )
val intent = Intent(this, CallActivity::class.java) val intent = Intent(this, CallActivity::class.java)
intent.putExtras(originalBundle!!) intent.putExtras(originalBundle!!)
startActivity(intent) startActivity(intent)
} else {
Log.w(TAG, "conversation was still null when clicked to answer call. User has to click another time.")
}
} }
@Suppress("MagicNumber") @Suppress("MagicNumber")