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

Merge pull request #4223 from nextcloud/bugfix/noid/fixNoChatForOldNcServerVersion

Browse Source 
fix to load chat for old server version
This commit is contained in:
Marcel Hibbe 2024-09-17 11:00:21 +02:00 committed by GitHub
commit 3b51fde300
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 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

@ -1744,7 +1744,9 @@ class CallActivity : CallBaseActivity() {
} }
private fun startCallTimeCounter(callStartTime: Long?) { private fun startCallTimeCounter(callStartTime: Long?) {
if (callStartTime != null && hasSpreedFeatureCapability( if (callStartTime != null &&
callStartTime != 0L &&
hasSpreedFeatureCapability(
conversationUser!!.capabilities!!.spreedCapability!!, SpreedFeatures.RECORDING_V1 conversationUser!!.capabilities!!.spreedCapability!!, SpreedFeatures.RECORDING_V1
) )
) { ) {

6
app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt
View File

@ -144,16 +144,16 @@ data class Conversation(
var callRecording: Int = 0, var callRecording: Int = 0,
@JsonField(name = ["avatarVersion"]) @JsonField(name = ["avatarVersion"])
var avatarVersion: String? = null, var avatarVersion: String? = "",
// Be aware that variables with "is" at the beginning will lead to the error: // Be aware that variables with "is" at the beginning will lead to the error:
// "@JsonField annotation can only be used on private fields if both getter and setter are present." // "@JsonField annotation can only be used on private fields if both getter and setter are present."
// Instead, name it with "has" at the beginning: isCustomAvatar -> hasCustomAvatar // Instead, name it with "has" at the beginning: isCustomAvatar -> hasCustomAvatar
@JsonField(name = ["isCustomAvatar"]) @JsonField(name = ["isCustomAvatar"])
var hasCustomAvatar: Boolean? = null, var hasCustomAvatar: Boolean? = false,
@JsonField(name = ["callStartTime"]) @JsonField(name = ["callStartTime"])
var callStartTime: Long? = null, var callStartTime: Long? = 0L,
@JsonField(name = ["recordingConsent"]) @JsonField(name = ["recordingConsent"])
var recordingConsentRequired: Int = 0, var recordingConsentRequired: Int = 0,