Skip to content

Commit

Permalink
fix to load chat for old server version
Browse files Browse the repository at this point in the history
With server version 23.0.12 it happened that the chat did not load because values were null. Now default values in json model are set (because that's easier than changing the entity).
Additionally a check was added in CallActivity that a callStartTime of 0 would not be used (but it should not be used anyway if it would be 0 because then capability should also not be available).

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
  • Loading branch information
mahibi authored and backportbot[bot] committed Sep 17, 2024
1 parent 05c6dc3 commit 5692212
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,9 @@ class CallActivity : CallBaseActivity() {
}

private fun startCallTimeCounter(callStartTime: Long?) {
if (callStartTime != null && hasSpreedFeatureCapability(
if (callStartTime != null &&
callStartTime != 0L &&
hasSpreedFeatureCapability(
conversationUser!!.capabilities!!.spreedCapability!!, SpreedFeatures.RECORDING_V1
)
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,16 @@ data class Conversation(
var callRecording: Int = 0,

@JsonField(name = ["avatarVersion"])
var avatarVersion: String? = null,
var avatarVersion: String? = "",

// 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."
// Instead, name it with "has" at the beginning: isCustomAvatar -> hasCustomAvatar
@JsonField(name = ["isCustomAvatar"])
var hasCustomAvatar: Boolean? = null,
var hasCustomAvatar: Boolean? = false,

@JsonField(name = ["callStartTime"])
var callStartTime: Long? = null,
var callStartTime: Long? = 0L,

@JsonField(name = ["recordingConsent"])
var recordingConsentRequired: Int = 0,
Expand Down

0 comments on commit 5692212

Please sign in to comment.