|
@@ -92,8 +92,12 @@ public class Conversation {
|
|
|
public Long lobbyTimer;
|
|
|
@JsonField(name = "lastReadMessage")
|
|
|
public int lastReadMessage;
|
|
|
+ @JsonField(name = "hasCall")
|
|
|
+ public boolean hasCall;
|
|
|
@JsonField(name = "callFlag")
|
|
|
public int callFlag;
|
|
|
+ @JsonField(name = "canStartCall")
|
|
|
+ public boolean canStartCall;
|
|
|
|
|
|
@JsonField(name = "canLeaveConversation")
|
|
|
public Boolean canLeaveConversation;
|
|
@@ -259,10 +263,18 @@ public class Conversation {
|
|
|
return this.lastReadMessage;
|
|
|
}
|
|
|
|
|
|
+ public boolean getHasCall() {
|
|
|
+ return hasCall;
|
|
|
+ }
|
|
|
+
|
|
|
public int getCallFlag() {
|
|
|
return this.callFlag;
|
|
|
}
|
|
|
|
|
|
+ public boolean getCanStartCall() {
|
|
|
+ return canStartCall;
|
|
|
+ }
|
|
|
+
|
|
|
public Boolean getUnreadMentionDirect() {
|
|
|
return unreadMentionDirect;
|
|
|
}
|
|
@@ -370,10 +382,18 @@ public class Conversation {
|
|
|
this.lastReadMessage = lastReadMessage;
|
|
|
}
|
|
|
|
|
|
+ public void setHasCall(boolean hasCall) {
|
|
|
+ this.hasCall = hasCall;
|
|
|
+ }
|
|
|
+
|
|
|
public void setCallFlag(int callFlag) {
|
|
|
this.callFlag = callFlag;
|
|
|
}
|
|
|
|
|
|
+ public void setCanStartCall(boolean canStartCall) {
|
|
|
+ this.canStartCall = canStartCall;
|
|
|
+ }
|
|
|
+
|
|
|
public void setUnreadMentionDirect(Boolean unreadMentionDirect) {
|
|
|
this.unreadMentionDirect = unreadMentionDirect;
|
|
|
}
|
|
@@ -411,9 +431,15 @@ public class Conversation {
|
|
|
if (lastReadMessage != that.lastReadMessage) {
|
|
|
return false;
|
|
|
}
|
|
|
+ if (hasCall != that.hasCall) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
if (callFlag != that.callFlag) {
|
|
|
return false;
|
|
|
}
|
|
|
+ if (canStartCall != that.canStartCall) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
if (!Objects.equals(roomId, that.roomId)) {
|
|
|
return false;
|
|
|
}
|
|
@@ -508,7 +534,9 @@ public class Conversation {
|
|
|
result = 31 * result + (lobbyState != null ? lobbyState.hashCode() : 0);
|
|
|
result = 31 * result + (lobbyTimer != null ? lobbyTimer.hashCode() : 0);
|
|
|
result = 31 * result + lastReadMessage;
|
|
|
+ result = 31 * result + (hasCall ? 1 : 0);
|
|
|
result = 31 * result + callFlag;
|
|
|
+ result = 31 * result + (canStartCall ? 1 : 0);
|
|
|
result = 31 * result + (canLeaveConversation != null ? canLeaveConversation.hashCode() : 0);
|
|
|
result = 31 * result + (canDeleteConversation != null ? canDeleteConversation.hashCode() : 0);
|
|
|
result = 31 * result + (notificationCalls != null ? notificationCalls.hashCode() : 0);
|
|
@@ -543,7 +571,9 @@ public class Conversation {
|
|
|
", lobbyState=" + lobbyState +
|
|
|
", lobbyTimer=" + lobbyTimer +
|
|
|
", lastReadMessage=" + lastReadMessage +
|
|
|
+ ", hasCall=" + hasCall +
|
|
|
", callFlag=" + callFlag +
|
|
|
+ ", canStartCall=" + canStartCall +
|
|
|
", canLeaveConversation=" + canLeaveConversation +
|
|
|
", canDeleteConversation=" + canDeleteConversation +
|
|
|
", notificationCalls=" + notificationCalls +
|